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

<div class="page_footer">
<div class="page_footer_text">#repo|escape#</div>
<a class="rss_logo" href="?cmd=changelog;style=rss">RSS</a>
</div>
</body>
</html>