From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:57 +0000 (-0700)
Subject: Merge branch 'cc/maint-diff-CC-binary'
X-Git-Tag: v1.7.2-rc0~43
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/5977744d045cacb809a3e3630dbbd28fe83976ae?hp=5977744d045cacb809a3e3630dbbd28fe83976ae

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
---