view tests/test-locate.out @ 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 5e9168401a68
children 7544700fd931
line wrap: on
line source

adding a
adding b
a
NONEXISTENT: No such file or directory
a
b
a: No such file or directory
NONEXISTENT: No such file or directory
b
a
NONEXISTENT: No such file in rev 9e1684505872
a
b