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="logo">
powered by<br/>
<a href="http://www.selenic.com/mercurial/">mercurial</a>
</div>

</body>
</html>