Merge branch 'jk/colors'
commit7a1aa0c28876e044351e78d8b8ae6cdbb10b5dfe
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 18:49:13 +0000 (14 11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 18:49:13 +0000 (14 11:49 -0700)
tree253b57c28fdea85b6e7730ab175ad89177442a0d
parent3cdff83fb0519bcfed35bca987c59d3557b1f2a7
parent8d00662d7d263448d90637ef6758fd2a0b526fec
Merge branch 'jk/colors'

"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
contrib/diff-highlight/diff-highlight