Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-empty-dir.out @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 5a034646e472
children ba198d17eea9
line wrap: on
line source

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