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)
commit4c244c25f044b62d2555746d947249215e7c55a7
treea17dc1acc45285a13d2cb82f985301a50b2c05c5
parentafb456a3835b8b22ec6420807243df480a61d815
parentc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0
Merge branch 'ah/doc-wserrorhighlight'

Doc update.

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