Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use vi if $EDITOR is unset.
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 10 Jun 2005 07:52:39 +0100
changeset 304 38fb7d23b78d
parent 303 15a9e55e7ea5
child 306 f06a4a3b86a7
Use vi if $EDITOR is unset.
hgmerge file | annotate | diff | comparison | revisions 
--- 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
hg-stable