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.
%% no changes%% no changes%% uncompressed contents in repothis is a test%% uncompress our working dir copythis is a test%% uncompress our new working dir copythis is a test