summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:51 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:51 -0700
commitb55b936038ba66233fb765b7b46ed6852dc8fdfb (patch)
treedf3750929bb0a41f16db1dce3621fac3d2e1ecea /builtin
parentd0dffcacf3a721789984aed5a5e0af738b1d9f36 (diff)
parentc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (diff)
downloadgit-b55b936038ba66233fb765b7b46ed6852dc8fdfb.tar.gz
Merge branch 'ah/doc-wserrorhighlight' into maint
Doc update. * ah/doc-wserrorhighlight: doc: add missing values "none" and "default" for diff.wsErrorHighlight
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions