wip merge

diff --git a/article.tex b/article.tex
index a650f36ab9080f36c344bbb75ba27d0a6ce71837..32f79205a8567f3d0efbfded7c9d8d889ff3baa1 100644 (file)
--- 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}