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.
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b