Merge branch 'ah/doc-wserrorhighlight' into maint

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

Junio C Hamano committed Aug 23, 2017 at 14:33 UTC b55b936038ba66233fb765b7b46ed6852dc8fdfb

No changes.