Code

Merge branch 'cc/maint-diff-CC-binary' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:04:14 +0000 (09:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:27:07 +0000 (09:27 -0700)
commit3c656899cdfbfdd40987625c4615a8c941d5968a
tree547b892074d90da576a25066e3504af9c60460f5
parenta8c4d925caba244de842f8fa663c3e6bb7000b89
parent296c6bb21a6980f6e5b42f0790d6365c1e3f696f
Merge branch 'cc/maint-diff-CC-binary' into maint

* cc/maint-diff-CC-binary:
  diff: fix "git show -C -C" output when renaming a binary file

Conflicts:
diff.c
diff.c