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.

     1

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

0 files, 0 changesets, 0 total revisions