From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Apr 2018 07:28:21 +0000 (+0900)
Subject: Merge branch 'jk/diff-highlight-graph-fix'
X-Git-Tag: v2.18.0-rc0~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d19e556529f2e0ac64e3bb434d30c33433df9ffd;p=git

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

d19e556529f2e0ac64e3bb434d30c33433df9ffd