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)
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file

Conflicts:
diff.c

No differences found