From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Mar 2018 01:27:22 +0000 (-0700)
Subject: Merge branch 'jk/diff-highlight-graph-fix' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb995f66e327af3d07964208e87b799f6e288cee

Merge branch 'jk/diff-highlight-graph-fix' into next

"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
---

eb995f66e327af3d07964208e87b799f6e288cee