Code

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)
* jc/color:
  Add colordiff for git to contrib/colordiff.
  Makefile: dependency for builtin-help.o

1  2 
Makefile

diff --cc Makefile
Simple merge