Merge branch 'en/merge-options-doc'

Doc update. * en/merge-options-doc: merge-options.txt: correct wording of --no-commit option

Junio C Hamano committed Mar 7, 2019 at 09:59 UTC 082c15ade1833e80a65c36d2499676a924d6d6aa

No changes.