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
%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
%% uncompress our new working dir copy
this is a test