Merge branch 'jc/color'
authorJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:07 +0000 (02:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:07 +0000 (02:05 -0700)
* jc/color:
  Add colordiff for git to contrib/colordiff.


Trivial merge