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>
<a class="title" href="?cmd=changeset;node=#node#;style=gitweb"><span class="age">#date|age# ago</span>#desc|firstline|escape#</a>
</div>
<div class="title_text">
<div class="log_link">
<a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a><br/>
</div>
<i>#author|obfuscate# [#date|rfc822date#] rev #rev#</i><br/>
</div>
<div class="log_body">
#desc|escape|addbreaks#
<br/>
<br/>
</div>