Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hg.1.txt @ 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 | 47f4fbee32c5 |
children | 7956893e8458 7718885070b1 |