tree 253b57c28fdea85b6e7730ab175ad89177442a0d
parent 3cdff83fb0519bcfed35bca987c59d3557b1f2a7
parent 8d00662d7d263448d90637ef6758fd2a0b526fec
author Junio C Hamano <gitster@pobox.com> 1429037353 -0700
committer Junio C Hamano <gitster@pobox.com> 1429037353 -0700

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