Mercurial > hg
diff hgmerge @ 1883:b98160cfb2f3
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 |
line wrap: on
line diff
--- a/hgmerge Fri Mar 10 22:42:59 2006 -0800 +++ b/hgmerge Fri Mar 10 23:34:02 2006 -0800 @@ -4,11 +4,15 @@ # # This tries to find a way to do three-way merge on the current system. # The result ought to end up in $1. +# +# 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 set -e # bail out quickly on failure -echo $1 $2 $3 - LOCAL="$1" BASE="$2" OTHER="$3"