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
mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "0 0"
cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "0 0"
hg pull ../a
hg heads