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
%% Should show unknown? unknown%% Should show unknown and b removed! b? unknown%% Should show a and unknownaunknown