# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1118386359 -3600
# Node ID 38fb7d23b78d69e8fa536f74bc16aa034d828a0a
# Parent  15a9e55e7ea58a5fea96a91d832eecdb9fbe1d9e
Use vi if $EDITOR is unset.


diff -r 15a9e55e7ea5 -r 38fb7d23b78d 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