define \merge and add it to notation section

diff --git a/article.tex b/article.tex
index fde6e2f5cccd274528791679a0be616000352cca..06b76126865f6c828a0fb58a3f7cbf9ae6d6c5b0 100644 (file)
--- 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