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

<div class="logo">
powered by<br/>
<a href="http://www.selenic.com/mercurial/">mercurial</a>
</div>

</body>
</html>