Merge branch 'cc/maint-diff-CC-binary'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700)
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file

Conflicts:
diff.c

No differences found