gendoc: re-add indentation to global option table
The indentation was lost in
bdc1cf692447.
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.