diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:38 -0700 |
| commit | 276661ff85a812d8986cae7fec9d69a81508c8cd (patch) | |
| tree | 916283eaca3cd2b7fe0dff279aad7b5c0e29c1d2 /xdiff/xpatience.c | |
| parent | Merge branch 'po/range-doc' into maint (diff) | |
| parent | diff-highlight: avoid highlighting combined diffs (diff) | |
| download | tgif-276661ff85a812d8986cae7fec9d69a81508c8cd.tar.xz | |
Merge branch 'bh/diff-highlight-graph' into maint
"diff-highlight" script (in contrib/) learned to work better with
"git log -p --graph" output.
* bh/diff-highlight-graph:
diff-highlight: avoid highlighting combined diffs
diff-highlight: add multi-byte tests
diff-highlight: ignore test cruft
diff-highlight: add support for --graph output
diff-highlight: add failing test for handling --graph output
diff-highlight: add some tests
Diffstat (limited to 'xdiff/xpatience.c')
0 files changed, 0 insertions, 0 deletions