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>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
The specified repository "#repo|escape#" is unknown, sorry.
Please go back to the main repository list page.
#footer#