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
0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
journal.dirstate