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

diff --git a/article.tex b/article.tex
index 714578d..609e0e3 100644
--- a/article.tex
+++ b/article.tex
@@ -578,8 +578,17 @@ $C \haspatch \p \equiv C \nothaspatch M$.
 
 Merge Ends applies.
 
-$D \isin Y \equiv D \le Y$.  $D \not\isin X$.
-
-Consider $D = C$.  
+$D \isin Y \equiv D \le Y$.  $D \not\isin X$.  Recall that we
+are considering $D \in \py$.
+
+Consider $D = C$.  Thus $C \in \py, L \in \py$.  
+But $X \not\haspatch \p$ means xxx wip
+But $X \not\haspatch \p$ means $D \not\in X$, 
+
+so we have $L = Y, R =
+X$.  Thus $R \not\haspatch \p$ and by Tip Self Inpatch $R \not\in
+\py$.  Thus by Tip Merge $R \in \pn$ and $M = \baseof{L}$.
+So by Base Acyclic, $M \nothaspatch \py$.  Thus we are expecting 
+$C \haspatch \py$.  And indeed $D \isin C$ and $D \le C$.  OK.
 
 \end{document}