From 8a69195a6c694ebddaf1d383ca0301041b05c2b4 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2012 17:58:04 +0100
Subject: [PATCH] notation: strip word "merge" from \setmergeof etc.; use new
 definition of \commitmerge based on \mergeof; commit the various other things
 we tried in notationtest for future reference

---
 article.tex      | 12 ++++++------
 notationtest.tex | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 notationtest.tex

diff --git a/article.tex b/article.tex
index 2253d43..5df0d91 100644
--- a/article.tex
+++ b/article.tex
@@ -84,10 +84,10 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\commitmerge}{{\mathcal M}}
-\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
+%\newcommand{\commitmerge}{\text{\commitmergename}}
+\newcommand{\commitmergeof}[4]{#1 \approx \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
-\newcommand{\commitmergename}{${\mathcal M}$}
+\newcommand{\commitmergename}{Git Merge}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
@@ -110,9 +110,9 @@
 \newcommand{\mergeof}[3]{\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
 
 \newcommand{\alg}[1]{\text{\bf #1}}
-\newcommand{\setmerge}{\alg{merge}}
-\newcommand{\setmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
-\newcommand{\stmtmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
+\newcommand{\setmerge}{\mergeof{}{}{}}
+\newcommand{\setmergeof}[3]{\mergeof{#1}{#2}{#3}}
+\newcommand{\stmtmergeof}[3]{\mergeof{#1}{#2}{#3}}
 
 %\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
 %\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
diff --git a/notationtest.tex b/notationtest.tex
new file mode 100644
index 0000000..aaf948a
--- /dev/null
+++ b/notationtest.tex
@@ -0,0 +1,16 @@
+%$$
+ C \has \mergeof{L}{M}{R}
+$$ $$
+ C \alg{ is-merge } \mergeof{L}{M}{R}
+$$ $$
+ C \alg{ ismerge } \mergeof{L}{M}{R}
+$$ $$
+ C \sqsupset \setmergeof{L}{M}{R}
+$$ $$
+ C \sqsupset \mergeof{L}{M}{R}
+$$ $$
+ C \approx \mergeof{L}{M}{R}
+$$ $$
+ C \sqsupseteqq \mergeof{L}{M}{R}
+$$
+
-- 
2.30.2