From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2015 19:12:25 +0000 (-0700)
Subject: Merge branch 'jk/colors' into maint
X-Git-Tag: v2.3.6~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d544696afab635005503b18d71ca150b53d788a4?ds=inline;hp=--cc

Merge branch 'jk/colors' into maint

"diff-highlight" (in contrib/) used to show byte-by-byte
differences, which meant that multi-byte characters can be chopped
in the middle.  It learned to pay attention to character boundaries
(assuming the UTF-8 payload).

* jk/colors:
diff-highlight: do not split multibyte characters
---

d544696afab635005503b18d71ca150b53d788a4