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 a > a
hg add a
hg commit -m test -d '0 0'

# Default operation
hg clone . ../b
cd ../b
cat a
hg verify

# No update
hg clone -U . ../c
cd ../c
cat a
hg verify

# Default destination
mkdir ../d
cd ../d
hg clone ../a
cd a
hg cat a