diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:43 -0700 |
| commit | e5272d304af3528163cd5faa822f88086448ae57 (patch) | |
| tree | 3790db42783219a328cfd83be301fbb3ee7eb0df /git-gui | |
| parent | c334effa2332e30199451695b148f02eb7d9fd13 (diff) | |
| parent | a17505f262b62e429bb0e188c5ed73ac749e25b8 (diff) | |
| download | git-e5272d304af3528163cd5faa822f88086448ae57.tar.gz git-e5272d304af3528163cd5faa822f88086448ae57.tar.xz | |
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
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions