Code

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)
commit5977744d045cacb809a3e3630dbbd28fe83976ae
tree276ab50231e80bf913148e421247a5a4ecf78653
parent98ad90fbab90a423ca835956d3121c60db2eb218
parent296c6bb21a6980f6e5b42f0790d6365c1e3f696f
Merge branch 'cc/maint-diff-CC-binary'

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

Conflicts:
diff.c
diff.c
t/t4015-diff-whitespace.sh