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
abort: repository a not found!
255
requesting all changes
abort: error: Connection refused
255
abort: repository a not found!
255
abort: destination '../a' already exists
1
abort: repository a not found!
255
abort: destination 'q' already exists