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
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
ls
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg co 0
# B should disappear
ls