Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-tags.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 | 6f274afc05c7 |
children | 7544700fd931 |
line wrap: on
line source
unknown acb14030fe0a tip acb14030fe0a21b60322c440ad2d20cf7685a376 first tip 1:b9154636be938d3d431e75a7c906504a079bfe07 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 b9154636be93 tip M a b9154636be93+ tip acb14030fe0a+ first acb14030fe0a21b60322c440ad2d20cf7685a376+ first M a c8edf04160c7 tip c8edf04160c7+b9154636be93+ tip M .hgtags