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

#header#
# HG changeset patch
# User #author#
# Date #date|date#
# Node ID #node#
#parent%changesetparent#
#desc#

#diff#