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.

<div class="page_footer">
<div class="page_footer_text">#repo|escape#</div>
<a class="rss_logo" href="?cmd=changelog;style=rss">RSS</a>
</div>
</body>
</html>