chiark / gitweb /
internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:10:23 +0000 (17:10 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2012 16:10:23 +0000 (17:10 +0100)
notation.tex

index 48ea1b7..bb12b5f 100644 (file)
@@ -86,7 +86,7 @@ the relevant Topbloke branches, we hope that
 if the user still cares about the Topbloke patch,
 git's merge algorithm will DTRT when trying to re-apply the changes.
 
-\item[ $\displaystyle \mergeof{C}{L}{M}{R} $ ]
+\item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
 The contents of a git merge result:
 
 $\displaystyle D \isin C \equiv