Mercurial > hg > pyhgsh

comparison hgmerge @ 1885:c4d577262d00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 11 Mar 2006 21:33:19 -0800
parents 4e44ca05a866
children 6a03cff2b0f5
comparison
equal deleted inserted replaced
1884:4e44ca05a866 1885:c4d577262d00
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.
7 # 8 #
8 # Environment variables set by Mercurial: 9 # Environment variables set by Mercurial:
9 # HG_ROOT repo root
10 # HG_FILE name of file within repo 10 # HG_FILE name of file within repo
11 # HG_MY_NODE revision being merged 11 # HG_MY_NODE revision being merged
12 # HG_OTHER_NODE revision being merged 12 # HG_OTHER_NODE revision being merged
13 13
14 set -e # bail out quickly on failure 14 set -e # bail out quickly on failure