From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Sep 2016 04:49:52 +0000 (-0700)
Subject: Merge branch 'bh/diff-highlight-graph'
X-Git-Tag: v2.11.0-rc0~170
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0b0a56fbed1b9544a811f0304cfc542709464f22;p=git-core%2Fgit.git

Merge branch 'bh/diff-highlight-graph'

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

0b0a56fbed1b9544a811f0304cfc542709464f22