| commit | 709cd912d4663af87903d3d278a3bab9d4d84153 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:51 +0000 (11 09:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:51 +0000 (11 09:29 -0700) | ||
| tree | 416e3f1cbd0b50ef317b59bbb337f3a7bea72765 | treesnapshot (tar.gz zip) |
| parent | 7974889a053574e449b55ca543a486e38e74864f | commitdiff |
| parent | b8767f791c15f119554c1466af60e4f2433ae971 | commitdiff |
Merge branch 'jc/diff-ws-error-highlight'
Allow whitespace breakages in deleted and context lines to be also
painted in the output.
* jc/diff-ws-error-highlight:
diff.c: --ws-error-highlight=<kind> option
diff.c: add emit_del_line() and emit_context_line()
t4015: separate common setup and per-test expectation
t4015: modernise style
Allow whitespace breakages in deleted and context lines to be also
painted in the output.
* jc/diff-ws-error-highlight:
diff.c: --ws-error-highlight=<kind> option
diff.c: add emit_del_line() and emit_context_line()
t4015: separate common setup and per-test expectation
t4015: modernise style
| Documentation/diff-options.txt | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| diff.h | diff1 | diff2 | blobhistory |