From: Junio C Hamano <gitster@pobox.com> Date: Tue, 14 Apr 2015 18:49:13 +0000 (-0700) Subject: Merge branch 'jk/colors' X-Git-Tag: v2.4.0-rc2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a1aa0c28876e044351e78d8b8ae6cdbb10b5dfe 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 --- 7a1aa0c28876e044351e78d8b8ae6cdbb10b5dfe