tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 11 Mar 2006 21:33:19 -0800
changeset 1885 c4d577262d00
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
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.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)