From: Junio C Hamano Date: Fri, 4 Aug 2017 16:29:14 +0000 (-0700) Subject: Merge branch 'as/diff-options-grammofix' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ddd1133c5e1c549ff9b73c6aafc16460dcf3570e;p=git.git Merge branch 'as/diff-options-grammofix' A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix --- ddd1133c5e1c549ff9b73c6aafc16460dcf3570e