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

     1

%% no changes

     2

%% no changes

     3

%% uncompressed contents in repo

     4

this is a test

     5

%% uncompress our working dir copy

     6

this is a test

     7

%% uncompress our new working dir copy

     8

this is a test