From 7bcd460d5b2d6b000aa3a612c48881b5bf29674d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Mar 2012 19:02:45 +0000
Subject: [PATCH] define \merge and add it to notation section

---
 article.tex | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/article.tex b/article.tex
index fde6e2f..06b7612 100644
--- a/article.tex
+++ b/article.tex
@@ -49,11 +49,12 @@
 
 \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{\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 ) }
@@ -148,14 +149,16 @@ 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|
+\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}
- \right\} $
+$ 
 
 \end{basedescript}
 \newpage
-- 
2.30.2