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 "[hooks]" > .hg/hgrc
echo 'precommit = echo precommit hook' >> .hg/hgrc
echo 'commit = echo commit hook: $NODE' >> .hg/hgrc
echo 'commit.b = echo commit hook b' >> .hg/hgrc
echo a > a
hg add a
hg commit -m "test" -d "0 0"