Merge branch 'rd/diff-options-typofix'
commitd676cc512a7aa17f6c7db53792c1e21c4ddfea42
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:41 +0000 (18 10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:41 +0000 (18 10:18 -0700)
tree3b5a0469b3a22eecb3f387c9f4b03f0a98b32ffa
parent1bd0e6779a3d6802826d2dc7b85b0ed009790bb6
parent7eedad15df615e1a2e34cb76920d5c60e9f8d8dd
Merge branch 'rd/diff-options-typofix'

Typofix.

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