notation: remove notation test file

[topbloke-formulae.git] / notation.tex

diff --git a/notation.tex b/notation.tex
index b5e0e9d5549c85d32514ae3e2756e56c33f7b0b2..82a2e647dbac266a769374a422727af8c92e6663 100644 (file)
--- 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
@@ -113,14 +112,15 @@ $$
 $$
 
 \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
-The contents of a git merge result:
+$C$ has exactly 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}
 $
 
+We will refer to this as \commitmergename.
+
 \end{basedescript}