commit | d544696afab635005503b18d71ca150b53d788a4 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Apr 21 12:12:25 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Apr 21 12:12:25 2015 -0700 |
tree | 0bfded7375b1b85dc2e4b67952beb19a798c4284 | |
parent | d3115a35fc29e7a55131a677878e67725d4cc165 [diff] | |
parent | 8d00662d7d263448d90637ef6758fd2a0b526fec [diff] |
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