From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:27:04 +0000 (-0700)
Subject: Merge branch 'ah/doc-wserrorhighlight'
X-Git-Tag: v2.15.0-rc0~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c244c25f044b62d2555746d947249215e7c55a7;p=thirdparty%2Fgit.git

Merge branch 'ah/doc-wserrorhighlight'

Doc update.

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

4c244c25f044b62d2555746d947249215e7c55a7