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

mkdir a
cd a
hg init
echo foo > b
hg add b
hg ci -m "b" -d "0 0"

chmod -w .hg

cd ..

hg clone a b

chmod +w a/.hg # let test clean up

cd b
hg verify