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 foo > b
hg add b
hg ci -m "b" -d "0 0"

chmod -w .hg

cd ..

hg clone a b
cd b
hg verify

cd ..

chmod +w a/.hg # let test clean up