wip experiment merge

diff --git a/article.tex b/article.tex
index 01800f96132a69fb7a89ab4e9e6ab9d0a82e9519..fde6e2f5cccd274528791679a0be616000352cca 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -49,9 +49,11 @@
 
 \newcommand{\pancs}{{\mathcal A}}
 \newcommand{\pends}{{\mathcal E}}
+\newcommand{\merge}{{\mathcal M}}
 
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
+\newcommand{\mergeof}[3]{\merge ( #1 , #2, #3 ) }
 
 \newcommand{\patchof}[1]{{\mathcal P} ( #1 ) }
 \newcommand{\baseof}[1]{{\mathcal B} ( #1 ) }
@@ -146,6 +148,15 @@ patch is applied to a non-Topbloke branch and then bubbles back to
 the Topbloke patch itself, we hope that git's merge algorithm will
 DTRT or that the user will no longer care about the Topbloke patch.
 
+\item[ $ \mergeof{L}{M}{R} $ ]
+$\displaystyle \left\{ C \middle|
+  \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}
+ \right\} $
+
 \end{basedescript}
 \newpage
 \section{Invariants}