Merge branch 'jk/colors' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:25 +0000 (12:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:25 +0000 (12:12 -0700)
commitd544696...fab635005503b18d71ca150b53d788a4
tree0bfded7...75b1b85dc2e4b67952beb19a798c4284copy hash to clipboard (tree)
parentd3115a3...fc29e7a55131a677878e67725d4cc165copy hash to clipboard (diff)
parent8d00662...7d263448d90637ef6758fd2a0b526feccopy hash to clipboard (diff)
contrib/diff-highlight/diff-highlight