Merge branch 'rd/diff-options-typofix'

Typofix. * rd/diff-options-typofix: diff-options.txt: fix minor typos, font inconsistencies, in docs

Junio C Hamano committed Jun 18, 2018 at 10:18 UTC d676cc512a7aa17f6c7db53792c1e21c4ddfea42

No changes.