From 29344b6ad90d4bc445e67d9b0025509ea555512e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2012 17:10:23 +0100
Subject: [PATCH] internal notation: rename \merge and \mergeof to \commitmerge
 and \commitmergeof - fix

---
 notation.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notation.tex b/notation.tex
index 48ea1b7..bb12b5f 100644
--- a/notation.tex
+++ b/notation.tex
@@ -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
-- 
2.30.2