From 3ac20de88d88bbe7cce4d6326d5b1c15126476d2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2012 17:27:19 +0100
Subject: [PATCH] notation: define \commitmergeof in terms of \stmtmergeof

---
 lemmas.tex   | 2 +-
 notation.tex | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lemmas.tex b/lemmas.tex
index 55cba60..23e22f3 100644
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -11,7 +11,7 @@ $$
     \text{as above with L and R exchanged}
   \end{cases}
 $$
-\proof{ ~ Truth table (ordered by original definition): \\
+\proof{ ~ Truth table (ordered by original definitions): \\
   \begin{tabular}{cccc|c|cc}
      $D = C$ &
           $\isin L$ &
diff --git a/notation.tex b/notation.tex
index b5e0e9d..f8f2b87 100644
--- a/notation.tex
+++ b/notation.tex
@@ -89,7 +89,6 @@ git's merge algorithm will DTRT when trying to re-apply the changes.
 \item[ $\displaystyle \stmtmergeof{L}{M}{R} $ ]
 The proper results of a merge.  Formally,
 where $L$, $M$ and $R$ are statements:
-
 $$
   \stmtmergeof{L}{M}{R}
     \equiv
@@ -117,9 +116,8 @@ 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
+    D = C : & \true \\
+    D \neq C : & \stmtmergeof{ D \isin L }{ D \isin M }{ D \isin R }
   \end{cases}
 $
 
-- 
2.30.2