From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Mar 2012 16:13:23 +0000 (+0000)
Subject: wip merge
X-Git-Tag: f0.2~176
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=3d1111b8b0f9f80fab557ecd0e9faf8aab04f6a9

wip merge
---

diff --git a/article.tex b/article.tex
index a650f36..32f7920 100644
--- a/article.tex
+++ b/article.tex
@@ -316,4 +316,25 @@ $\qed$
 If $D = C$, trivial.  For $D \neq C$:
 $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$.  $\qed$
 
+\section{Merge}
+
+Given commits $L$, $R$, $M$:
+\gathbegin
+ C \hasparents \{ L, R \}
+\gathnext
+ \patchof{C} = \patchof{L}
+\gathnext
+ D \isin C \equiv
+  \begin{cases}
+    (D \isin L \land D \isin R) \lor D = C : & \true \\
+    (D \not\isin L \land D \not\isin R) \land D \neq C : & \false \\
+    \text{otherwise} : & D \not\isin M
+  \end{cases}
+\end{gather}
+
+Conditions
+\gathbegin
+ M < L, M < R
+\end{gather}
+
 \end{document}