merge no replay

diff --git a/article.tex b/article.tex
index 1f3d1647d8df7544fe1eabf8e2d8b6841b6d069b..3d331786a158e419dd13ee583f7446e8859b1b71 100644 (file)
--- 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}
 
 
 \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$:}
 
 \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}
 
 \end{document}