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 a
cd a
echo a > foo
hg add foo
hg commit -m 1 -d "0 0"
rm foo
hg remove foo
hg commit -m 2 -d "0 0"
hg export 0
hg export 1
hg log -p -r 0
hg log -p -r 1
cd ..
hg clone a b