From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Mar 2012 18:45:14 +0000 (+0000)
Subject: wip experiment merge
X-Git-Tag: f0.2~155
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=139e1dd4dce6fcbc306dc4798f4cac017a0a4897

wip experiment merge
---

diff --git a/article.tex b/article.tex
index 01800f9..fde6e2f 100644
--- 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}