git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3115a3 8d00662)
Merge branch 'jk/colors' into maint
authorJunio C Hamano <redacted>
Tue, 21 Apr 2015 19:12:25 +0000 (12:12 -0700)
committerJunio C Hamano <redacted>
Tue, 21 Apr 2015 19:12:25 +0000 (12:12 -0700)
commitd544696afab635005503b18d71ca150b53d788a4
tree0bfded7375b1b85dc2e4b67952beb19a798c4284tree | snapshot
parentd3115a35fc29e7a55131a677878e67725d4cc165commit | diff
parent8d00662d7d263448d90637ef6758fd2a0b526feccommit | 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
contrib/diff-highlight/diff-highlight diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT