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
adding a
adding b
a
NONEXISTENT: No such file or directory
a
b
a: No such file or directory
NONEXISTENT: No such file or directory
b
a
NONEXISTENT: No such file in rev 9e1684505872
a
b