Merge branch 'ah/doc-wserrorhighlight'

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

Junio C Hamano committed Aug 11, 2017 at 13:27 UTC 4c244c25f044b62d2555746d947249215e7c55a7

No changes.