From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Aug 2017 21:33:51 +0000 (-0700)
Subject: Merge branch 'ah/doc-wserrorhighlight' into maint
X-Git-Tag: v2.14.2~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b55b936038ba66233fb765b7b46ed6852dc8fdfb;p=thirdparty%2Fgit.git

Merge branch 'ah/doc-wserrorhighlight' into maint

Doc update.

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

b55b936038ba66233fb765b7b46ed6852dc8fdfb