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

syntax: glob

*.elc
*.orig
*.rej
*~
*.so
*.pyc
*.swp
*.prof
tests/*.err
build
dist
doc/*.[0-9]
doc/*.[0-9].{x,ht}ml
MANIFEST
patches
mercurial/__version__.py

syntax: regexp
^\.pc/