internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof...

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 92092d285d92fc2e228e37e2839a15acf984d11a..8cb19b26b2b44b5483366bb540723ddb94a8e24a 100644 (file)
--- 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}}