Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/hgmerge	Fri Mar 10 23:34:36 2006 -0800
+++ b/hgmerge	Sat Mar 11 21:33:19 2006 -0800
@@ -3,10 +3,10 @@
 # hgmerge - default merge helper for Mercurial
 #
 # This tries to find a way to do three-way merge on the current system.
-# The result ought to end up in $1.
+# The result ought to end up in $1.  Script is run in root directory of
+# repository.
 #
 # Environment variables set by Mercurial:
-# HG_ROOT            repo root
 # HG_FILE            name of file within repo
 # HG_MY_NODE         revision being merged
 # HG_OTHER_NODE      revision being merged