chiark / gitweb /
notation: use \commitmergename in its definition text, and clarify
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:56:48 +0000 (17:56 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:56:48 +0000 (17:56 +0100)
notation.tex

index f8f2b87..82a2e64 100644 (file)
@@ -112,7 +112,7 @@ $$
 $$
 
 \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}
@@ -121,4 +121,6 @@ $\displaystyle D \isin C \equiv
   \end{cases}
 $
 
+We will refer to this as \commitmergename.
+
 \end{basedescript}