diff mercurial/changelog.py @ 1885:c4d577262d00

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 9d2c2e6b32b5
children 11d12bd6e1dc 74d3f5336b66
line wrap: on
line diff