Merge branch 'as/diff-options-grammofix'

A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix

Junio C Hamano committed Aug 4, 2017 at 09:29 UTC ddd1133c5e1c549ff9b73c6aafc16460dcf3570e

No changes.