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
#!/bin/sh
hg init rep
cd rep
mkdir dir
touch foo dir/bar
hg -v addremove
hg -v commit -m "add 1" -d "0 0"
cd dir/
touch ../foo_2 bar_2
hg -v addremove
hg -v commit -m "add 2" -d "0 0"