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.

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
journal.dirstate