chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d326638
)
wip merge complex
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 17:31:13 +0000
(17:31 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 17:31:13 +0000
(17:31 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index a0adacbdee9b8d02bb1f2421f8158b1a43b505b2..2f512f4c96e2215b002ae886742a107753823bb2 100644
(file)
--- 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}