From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 May 2012 18:48:02 +0000 (+0100)
Subject: strategy: notation: setmerge -> merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=57b07d497639e94a7e43b305771beb0d30157d1b

strategy: notation: setmerge -> merge
---

diff --git a/article.tex b/article.tex
index b38099c..f52c275 100644
--- a/article.tex
+++ b/article.tex
@@ -102,7 +102,7 @@
 %\newcommand{\assign}{' =}
 
 \newcommand{\alg}[1]{\text{\bf #1}}
-\newcommand{\setmerge}{\alg{set-merge}}
+\newcommand{\setmerge}{\alg{merge}}
 \newcommand{\setmergeof}[3]{\setmerge\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
 %\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}