tests/test-locate.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:00 -0600
changeset 1699 83e8cd97b9f9
parent 1622 5e9168401a68
child 1933 7544700fd931
permissions -rw-r--r--
hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

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