From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Jun 2006 21:36:02 +0000 (-0700)
Subject: Merge branch 'jc/diff'
X-Git-Tag: v1.4.1-rc2~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6a0dbb8a5c41770c2280de15c3202970c6515ccc;p=git.git

Merge branch 'jc/diff'

* jc/diff:
  diff --color: use $GIT_DIR/config
---

6a0dbb8a5c41770c2280de15c3202970c6515ccc