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>#repo|escape#: searching for #query|escape#</title>
</head>
<body>
<div class="buttons">
<a href="?cl=tip">changelog</a>
<a href="?tags=">tags</a>
<a href="?mf=#manifest|short#;path=/">manifest</a>
</div>
<h2>searching for #query|escape#</h2>
<form>
<p>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30" value="#query|escape#">
</p>
</form>
#entries#
<form>
<p>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30" value="#query|escape#">
</p>
</form>
#footer#