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
checking changesetschecking manifestscrosschecking files in changesets and manifestschecking files0 files, 0 changesets, 0 total revisions