hgmerge

--- a/hgmerge	Fri Jun 10 07:50:20 2005 +0100
+++ b/hgmerge	Fri Jun 10 07:52:39 2005 +0100
@@ -11,6 +11,8 @@
 BASE=$2
 OTHER=$3
 
+EDITOR="${EDITOR:-vi}"
+
 # Back up our file
 cp $LOCAL $LOCAL.orig