From: Junio C Hamano Date: Fri, 4 Aug 2017 16:29:14 +0000 (-0700) Subject: Merge branch 'as/diff-options-grammofix' X-Git-Tag: v2.14.0~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ddd1133c5e1c549ff9b73c6aafc16460dcf3570e?hp=ddd1133c5e1c549ff9b73c6aafc16460dcf3570e Merge branch 'as/diff-options-grammofix' A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix ---