Merge branch 'ah/doc-wserrorhighlight' into maint
commitb55b936038ba66233fb765b7b46ed6852dc8fdfb
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:51 +0000 (23 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:51 +0000 (23 14:33 -0700)
treedf3750929bb0a41f16db1dce3621fac3d2e1ecea
parentd0dffcacf3a721789984aed5a5e0af738b1d9f36
parentc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0
Merge branch 'ah/doc-wserrorhighlight' into maint

Doc update.

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