Mercurial > public > mercurial-scm > hg-stable

diff hgmerge @ 304:38fb7d23b78d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use vi if $EDITOR is unset.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 10 Jun 2005 07:52:39 +0100
parents 15a9e55e7ea5
children f06a4a3b86a7
line wrap: on
line diff
--- 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