comparison mercurial/filelog.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 dca956c9767d
children c21b54f7f7b8 74d3f5336b66
comparison
equal deleted inserted replaced
1884:4e44ca05a866 1885:c4d577262d00