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 a
cd a
echo a > foo
hg add foo
hg commit -m 1 -d "0 0"
rm foo
hg remove foo
hg commit -m 2 -d "0 0"
hg export 0
hg export 1
hg log -p -r 0
hg log -p -r 1
cd ..
hg clone a b