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
Junio C Hamano committed
Jun 22, 2010 at 09:04 UTC
3c656899cdfbfdd40987625c4615a8c941d5968a
No changes.