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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     1
321
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     2
cat: sub/b: No such file or directory
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     3
ls: sub: No such file or directory