diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-15 12:30:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-15 12:30:14 -0700 |
| commit | abecddea25e9c39857b963c8a0cffbbdc135caa9 (patch) | |
| tree | 2a3be062a6b4edf77cc4e974fec5049e6ce8b535 /merge-blobs.h | |
| parent | 961abca02c532626df631c851688ec433095d93d (diff) | |
| parent | 3f4f17b51b30262041a2248ef9f966f6248aed50 (diff) | |
| download | git-abecddea25e9c39857b963c8a0cffbbdc135caa9.tar.gz | |
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
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions