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#: #file|escape# history</title>
<link rel="alternate" type="application/rss+xml"
href="?fl=0;file=#file|urlescape#;style=rss" title="RSS feed for #repo|escape#:#file#">
</head>
</head>
<body>
<div class="buttons">
<a href="?cl=tip">changelog</a>
<a href="?tags=">tags</a>
<a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
<a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a>
<a type="application/rss+xml" href="?fl=0;file=#file|urlescape#;style=rss">rss</a>
</div>
<h2>#file|escape# revision history</h2>
#entries%filelogentry#
#footer#