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.
....................----------------------------------------------------------------------Ran 20 tests in 0.000sOK