tests/test-empty-dir.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Thu, 23 Feb 2006 18:10:04 +0100
changeset 1798 d610fe0e6893
parent 925 5a034646e472
child 1926 ba198d17eea9
permissions -rw-r--r--
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.

321
cat: sub/b: No such file or directory
ls: sub: No such file or directory