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
echo 123 > a
hg add a
hg commit -m "first" -d "0 0" a
mkdir sub
echo 321 > sub/b
hg add sub/b
hg commit -m "second" -d "0 0" sub/b
cat sub/b
hg co 0
cat sub/b
ls sub

true