Merge branch 'jc/color' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 22 Apr 2006 05:25:16 +0000 (22:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 22 Apr 2006 05:25:16 +0000 (22:25 -0700)
commit076d1d6adcfe81d3419b0ce2afa1bbc348e51be1
tree914448427098d3de21992898f3299a4645847837
parent6082c4433be3d0390eca56897bd0907407dc55eb
parent96afa0764e6b58a38b21befded2c8fd0543fab2a
Merge branch 'jc/color' into next

* jc/color:
  Add colordiff for git to contrib/colordiff.
  Makefile: dependency for builtin-help.o
Makefile