Merge branch 'jc/ws-error-highlight'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:43 +0000 (13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:43 +0000 (13:14 -0700)
commite5272d304af3528163cd5faa822f88086448ae57
tree3790db42783219a328cfd83be301fbb3ee7eb0df
parentc334effa2332e30199451695b148f02eb7d9fd13
parenta17505f262b62e429bb0e188c5ed73ac749e25b8
Merge branch 'jc/ws-error-highlight'

"git diff/log --ws-error-highlight=<kind>" lacked the corresponding
configuration variable to set it by default.

* jc/ws-error-highlight:
  diff: introduce diff.wsErrorHighlight option
  diff.c: move ws-error-highlight parsing helpers up
  diff.c: refactor parse_ws_error_highlight()
  t4015: split out the "setup" part of ws-error-highlight test
Documentation/diff-config.txt
Documentation/diff-options.txt
diff.c