Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 1883:b98160cfb2f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
give more info to hgmerge script.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 23:34:02 -0800
parents 05c7d75be925
children 4e44ca05a866
comparison
equal deleted inserted replaced
1882:c0320567931f 1883:b98160cfb2f3
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.
7 #
8 # Environment variables set by Mercurial:
9 # HG_ROOT repo root
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
10 echo $1 $2 $3
11 15
12 LOCAL="$1" 16 LOCAL="$1"
13 BASE="$2" 17 BASE="$2"
14 OTHER="$3" 18 OTHER="$3"
15 19