From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Aug 2013 19:07:35 +0000 (+0100)
Subject: merge: rename Foreign Merge (was Foreign Merges)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=13bb63711973608b167a8624d32e5323b866bbe6

merge: rename Foreign Merge (was Foreign Merges)
---

diff --git a/merge.tex b/merge.tex
index 77b6788..746ba2d 100644
--- a/merge.tex
+++ b/merge.tex
@@ -66,14 +66,14 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
       \forall_{E \in \pendsof{K}{\py}} T \ge E
     , \text{where} \{J,K\} = \{L,R\}
 }\]
-\[ \eqn{ Foreign Merges }{
+\[ \eqn{ Foreign Merge }{
     \isforeign{L} \implies \isforeign{R}
 }\]
 
 \subsection{Non-Topbloke merges}
 
 We require both $\isforeign{L}$ and $\isforeign{R}$
-(Foreign Merges, above).
+(Foreign Merge, above).
 I.e. not only is it forbidden to merge into a Topbloke-controlled
 branch without Topbloke's assistance, it is also forbidden to
 merge any Topbloke-controlled branch into any plain git branch.
@@ -323,7 +323,7 @@ $\qed$
 \subsection{Foreign Ancestry}
 
 Only relevant if $\isforeign{L}$, in which case
-$\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
+$\isforeign{C}$ and by Foreign Merge $\isforeign{R}$,
 so Totally Foreign Ancestry applies.  $\qed$
 
 \subsection{Bases' Children}
@@ -344,5 +344,5 @@ $R$.
 
 Other possibilities for $L \in \pn$ are excluded by Base Merge.
 
-If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merges.
+If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merge.