From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Mar 2012 17:51:09 +0000 (+0000)
Subject: merge no replay
X-Git-Tag: f0.2~173
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=d380695f58ab5d366203d91873ffa17ba809447e

merge no replay
---

diff --git a/article.tex b/article.tex
index 1f3d164..3d33178 100644
--- a/article.tex
+++ b/article.tex
@@ -347,9 +347,27 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
 
 \subsection{No Replay}
 
-\subsubsection{For $D=C$:} $D \isin C, D \le C$, trivial.
+\subsubsection{For $D=C$:} $D \isin C, D \le C$.  OK.
 
 \subsubsection{For $D \isin L \land D \isin R$:}
-$D \isin C$.  And $D \isin L
+$D \isin C$.  And $D \isin L \implies D \le L \implies D \le C$.  OK.
+
+\subsubsection{For $D \neq C \land D \not\isin L \land D \not\isin R$:}
+$D \not\isin C$.  OK.
+
+\subsubsection{For $D \neq C \land D \not\isin L \land D \not\isin R$:}
+$D \not\isin C$.  OK.
+
+\subsubsection{For $D \neq C \land (D \isin L \equiv D \not\isin R)
+ \land D \not\isin M$:}
+$D \isin C$.  Also $D \isin L \lor D \isin R$ so $D \le L \lor D \le
+R$ so $D \le C$.  OK.
+
+\subsubsection{For $D \neq C \land (D \isin L \equiv D \not\isin R)
+ \land D \isin M$:}
+$D \not\isin C$.  Also $D \isin L \lor D \isin R$ so $D \le L \lor D \le
+R$ so $D \le C$.  OK.
+
+$\qed$
 
 \end{document}