hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling

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/