Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 1920:b7cc0f323a4c
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 12 Mar 2006 16:21:59 -0800 |
parents | c4d577262d00 |
children | 6a03cff2b0f5 |
line wrap: on
line diff
--- a/hgmerge +++ b/hgmerge @@ -3,7 +3,13 @@ # 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_FILE name of file within repo +# HG_MY_NODE revision being merged +# HG_OTHER_NODE revision being merged set -e # bail out quickly on failure