X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=8cb19b26b2b44b5483366bb540723ddb94a8e24a;hp=92092d285d92fc2e228e37e2839a15acf984d11a;hb=e938c1413dba5cf8dc107871664216d269950b69;hpb=9487356344b09d6e8276c9a93a7a58913afcf259

diff --git a/article.tex b/article.tex
index 92092d2..8cb19b2 100644
--- a/article.tex
+++ b/article.tex
@@ -84,8 +84,8 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\merge}{{\mathcal M}}
-\newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
+\newcommand{\commitmerge}{{\mathcal M}}
+\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
 
 \newcommand{\patch}{{\mathcal P}}