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

adding a
adding b
a
NONEXISTENT: No such file or directory
a
b
a: No such file or directory
NONEXISTENT: No such file or directory
b
a
NONEXISTENT: No such file in rev 9e1684505872
a
b