diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:21 +0900 |
| commit | d19e556529f2e0ac64e3bb434d30c33433df9ffd (patch) | |
| tree | d3e1783e0e89f9b1fabafd3d881f4f25e586b86c /git-gui/lib/diff.tcl | |
| parent | 0873c393c750d32a111ee66ab4ca4d7d21bee0ba (diff) | |
| parent | 4551fbba141e0b2e4d16830f76f784e9c960bdf8 (diff) | |
Merge branch 'jk/diff-highlight-graph-fix'
"diff-highlight" filter (in contrib/) learned to undertand "git log
--graph" output better.
* jk/diff-highlight-graph-fix:
diff-highlight: detect --graph by indent
diff-highlight: use flush() helper consistently
diff-highlight: test graphs with --color
diff-highlight: test interleaved parallel lines of history
diff-highlight: prefer "echo" to "cat" in tests
diff-highlight: use test_tick in graph test
diff-highlight: correct test graph diagram
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions