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.
#header#
<title>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
<table>
<tr>
<td>Name</td>
<td>Description</td>
<td>Contact</td>
<td>Last change</td>
<td> </td>
<tr>
#entries%indexentry#
</table>
#footer#