X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=fac5c82efd6483ac6cc865cbd2db836f2d29d81e;hp=714578dad5eba4bd461cb2db12c3c74abe3b3327;hb=13285d550a2eceb866519b89d1ed3c4894f3db65;hpb=be2bcb7972442b62e7f7c47e53aae58ba359f57a

diff --git a/article.tex b/article.tex
index 714578d..fac5c82 100644
--- a/article.tex
+++ b/article.tex
@@ -490,10 +490,11 @@ We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 }\]
 \[ \eqn{ Merge Ends }{
     X \not\haspatch \p \land
-    Y \haspatch \p \land
-    E \in \pendsof{X}{\py}
-  \implies
+    Y \haspatch \p
+  \implies \left[
+  \bigforall_{E \in \pendsof{X}{\py}}
     E \le Y
+  \right]
 }\]
 
 \subsection{No Replay}
@@ -572,14 +573,19 @@ So indeed $L \haspatch \p \land R \haspatch \p \implies C \haspatch \p$.
 
 \subsubsection{For (wlog) $X \not\haspatch \p, Y \haspatch \p$:}
 
-$C \haspatch \p \equiv C \nothaspatch M$.
+$C \haspatch \p \equiv M \nothaspatch \p$.
 
 \proofstarts
 
-Merge Ends applies.
-
+Merge Ends applies.  Recall that we are considering $D \in \py$.
 $D \isin Y \equiv D \le Y$.  $D \not\isin X$.
-
-Consider $D = C$.  
+We will show for each of
+various cases that $D \isin C \equiv M \nothaspatch \p \land D \le C$
+(which suffices by definition of $\haspatch$ and $\nothaspatch$).
+
+Consider $D = C$.  Thus $C \in \py, L \in \py$, and by Tip
+Self Inpatch $L \haspatch \p$, so $L=Y, R=X$.  By Tip Merge,
+$M=\baseof{L}$.  So by Base Acyclic $D \not\isin M$, i.e.
+$M \nothaspatch \p$.  And indeed $D \isin C$ and $D \le C$.  OK.
 
 \end{document}