X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=06b76126865f6c828a0fb58a3f7cbf9ae6d6c5b0;hb=7bcd460d5b2d6b000aa3a612c48881b5bf29674d;hp=01800f96132a69fb7a89ab4e9e6ab9d0a82e9519;hpb=d1afd16455a7de8e90e79610f5af798faad0bd44;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 01800f9..06b7612 100644
--- a/article.tex
+++ b/article.tex
@@ -53,6 +53,9 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
+\newcommand{\merge}[4]{{\mathcal M}(#1,#2,#3,#4)}
+%\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
+
 \newcommand{\patchof}[1]{{\mathcal P} ( #1 ) }
 \newcommand{\baseof}[1]{{\mathcal B} ( #1 ) }
 
@@ -146,6 +149,17 @@ 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[ $\displaystyle \merge{C}{L}{M}{R} $ ]
+The contents of a git merge result:
+
+$\displaystyle 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{basedescript}
 \newpage
 \section{Invariants}