From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 6 Mar 2012 17:31:13 +0000 (+0000)
Subject: wip merge complex
X-Git-Tag: f0.2~137
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=81ac90d1051946e902cd316e19c733ddf26ad1c7

wip merge complex
---

diff --git a/article.tex b/article.tex
index a0adacb..2f512f4 100644
--- a/article.tex
+++ b/article.tex
@@ -488,6 +488,13 @@ We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
       \text{otherwise} : & \false
    \end{cases}
 }\]
+\[ \eqn{ Merge Ends }{
+    X \not\haspatch \p \land
+    Y \haspatch \p \land
+    E \in \pendsof{X}{\py}
+  \implies
+    E \le Y
+}\]
 
 \subsection{No Replay}
 
@@ -563,4 +570,10 @@ OK for $C \haspatch P$.
 
 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$.
+
+\proofstarts
+
 \end{document}