From: Junio C Hamano <junkio@cox.net>
Date: Sat, 22 Apr 2006 05:25:16 +0000 (-0700)
Subject: Merge branch 'jc/color' into next
X-Git-Tag: v1.4.1-rc1~193
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=076d1d6adcfe81d3419b0ce2afa1bbc348e51be1;p=git.git

Merge branch 'jc/color' into next

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

076d1d6adcfe81d3419b0ce2afa1bbc348e51be1