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 unknown
? unknown
%% Should show unknown and b removed
! b
? unknown
%% Should show a and unknown
a
unknown