Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-permissions.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 | f0b13c019b04 |
children | 3053fc33f545 |
line wrap: on
line source
checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions checking changesets checking manifests crosschecking files in changesets and manifests checking files verify failed checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions commit failed