help: improve merge-tools topic, describe --tool and clarify details
This doesn't make it simpler, but it makes it more correct.
With help from erikz, mg and abuehl.
Testing that hghave does not crash when checking features $ "$TESTDIR/hghave" --test-features 2>/dev/null