| commit | abecddea25e9c39857b963c8a0cffbbdc135caa9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Jul 2015 19:30:14 +0000 (15 12:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Jul 2015 19:30:14 +0000 (15 12:30 -0700) | ||
| tree | 2a3be062a6b4edf77cc4e974fec5049e6ce8b535 | treesnapshot (tar.gz zip) |
| parent | 961abca02c532626df631c851688ec433095d93d | commitdiff |
| parent | 3f4f17b51b30262041a2248ef9f966f6248aed50 | commitdiff |
Merge branch 'jc/diff-ws-error-highlight'
A hotfix to a new feature in 2.5.0-rc.
* jc/diff-ws-error-highlight:
diff: parse ws-error-highlight option more strictly
A hotfix to a new feature in 2.5.0-rc.
* jc/diff-ws-error-highlight:
diff: parse ws-error-highlight option more strictly
| diff.c | diff1 | diff2 | blobhistory |