notation: use \commitmergename in its definition text, and clarify

diff --git a/notation.tex b/notation.tex
index f8f2b87973b9ad3740b7c4f4a595ac10e293c830..82a2e647dbac266a769374a422727af8c92e6663 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -112,7 +112,7 @@ $$
 $$
 
 \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
 $$
 
 \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}
 
 $\displaystyle D \isin C \equiv
   \begin{cases}


@@ -121,4 +121,6 @@ $\displaystyle D \isin C \equiv
   \end{cases}
 $
 
   \end{cases}
 $
 

+We will refer to this as \commitmergename.
+

 \end{basedescript}
 \end{basedescript}