Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-update-reverse @ 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 | 3a0b69ea5708 |
| children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
| 1797:42f75cd04bf4 | 1798:d610fe0e6893 |
|---|