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)
commit3a403e49b90ff30e3253a6a66e8e7cc3a1d33c8f
tree58f0fd419944180575843ad3c4773eee3454855d
parenta549e11cc2fee10ddf66dd98ea79f7c624eee34e
parent96afa0764e6b58a38b21befded2c8fd0543fab2a
Merge branch 'jc/color'

* jc/color:
  Add colordiff for git to contrib/colordiff.