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

adding foo

     2

adding bomb

     3

adding a.c

     4

adding dir/a.o

     5

adding dir/b.o

     6

! a.c

     7

! dir/a.o

     8

! dir/b.o

     9

? .hgignore

    10

a.c: unsupported file type (type is fifo)

    11

! a.c