Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-locate.out @ 1798:d610fe0e6893
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 | 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