From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Sep 2016 20:51:38 +0000 (-0700)
Subject: Merge branch 'bh/diff-highlight-graph' into maint
X-Git-Tag: v2.10.1~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/276661ff85a812d8986cae7fec9d69a81508c8cd

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

276661ff85a812d8986cae7fec9d69a81508c8cd