From 6768952437fc5b6b4178361ea7fc852c2e4945cd Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 6 Mar 2012 21:16:55 +0000
Subject: [PATCH] wip merge complex

---
 article.tex | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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}
-- 
2.30.2