hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
#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#