]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ah/doc-wserrorhighlight'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:04 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:04 +0000 (13:27 -0700)
Doc update.

* ah/doc-wserrorhighlight:
  doc: add missing values "none" and "default" for diff.wsErrorHighlight

1  2 
Documentation/diff-options.txt

Simple merge