Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
303:15a9e55e7ea5 304:38fb7d23b78d
8 set -e # bail out quickly on failure 8 set -e # bail out quickly on failure
9 9
10 LOCAL=$1 10 LOCAL=$1
11 BASE=$2 11 BASE=$2
12 OTHER=$3 12 OTHER=$3
13
14 EDITOR="${EDITOR:-vi}"
13 15
14 # Back up our file 16 # Back up our file
15 cp $LOCAL $LOCAL.orig 17 cp $LOCAL $LOCAL.orig
16 18
17 # Attempt to do a non-interactive merge 19 # Attempt to do a non-interactive merge