Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 1920:b7cc0f323a4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 12 Mar 2006 16:21:59 -0800
parents c4d577262d00
children 6a03cff2b0f5
comparison
equal deleted inserted replaced
1919:8f565af14095 1920:b7cc0f323a4c
1 #!/bin/sh 1 #!/bin/sh
2 # 2 #
3 # hgmerge - default merge helper for Mercurial 3 # hgmerge - default merge helper for Mercurial
4 # 4 #
5 # This tries to find a way to do three-way merge on the current system. 5 # This tries to find a way to do three-way merge on the current system.
6 # The result ought to end up in $1. 6 # The result ought to end up in $1. Script is run in root directory of
7 # repository.
8 #
9 # Environment variables set by Mercurial:
10 # HG_FILE name of file within repo
11 # HG_MY_NODE revision being merged
12 # HG_OTHER_NODE revision being merged
7 13
8 set -e # bail out quickly on failure 14 set -e # bail out quickly on failure
9 15
10 LOCAL="$1" 16 LOCAL="$1"
11 BASE="$2" 17 BASE="$2"