Merge branch 'jc/diff'
commit6a0dbb8a5c41770c2280de15c3202970c6515ccc
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:02 +0000 (26 14:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:02 +0000 (26 14:36 -0700)
treeeee7a41e999ba8675bc81b3d2d203cfcf0157140
parent9f9817e34a2cdead809854a0b3b2c93969663402
parent801235c5e6bff0ec1c4e41c9d46535ead3b693c1
Merge branch 'jc/diff'

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