From 57b07d497639e94a7e43b305771beb0d30157d1b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 May 2012 19:48:02 +0100
Subject: [PATCH] strategy: notation: setmerge -> merge

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

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}
-- 
2.30.2