X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=merge.tex;h=746ba2d6f6dead05b0e72c95cc1fef058365a505;hp=1d22aec19d64ddcf5fd357660c3ca9580e3f546a;hb=13bb63711973608b167a8624d32e5323b866bbe6;hpb=ff4ffb2eb74387bab00f6f7536f1037bb9a9f0aa

diff --git a/merge.tex b/merge.tex
index 1d22aec..746ba2d 100644
--- a/merge.tex
+++ b/merge.tex
@@ -35,7 +35,7 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
      \lor
    R \in \foreign
      \lor
-   R \in \pqy
+   ( R \in \pqy \land \pq \neq \p )
   \big]
 }\]
 \[ \eqn{ Merge Acyclic }{
@@ -59,21 +59,21 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
    \right]
 }\]
 \[ \eqn{ Suitable Tips }{
-    \bigforall_{\p \neq \patchof{L}, \; C \haspatch \p}
+    \bigforall_{\p \patchisin C, \; \py \neq \patchof{L}}
     \bigexists_T
       \pendsof{J}{\py} = \{ T \}
      \land
       \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.