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

diff -r 3903775176ed b

     2

--- /dev/null

     3

+++ b/b

     4

@@ -0,0 +1,1 @@

     5

+123

     6

diff -r 3903775176ed b

     7

--- /dev/null

     8

+++ b/b

     9

@@ -0,0 +1,1 @@

    10

+123