summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:57 (GMT)
commit5977744d045cacb809a3e3630dbbd28fe83976ae (patch)
tree276ab50231e80bf913148e421247a5a4ecf78653 /config.c
parent98ad90fbab90a423ca835956d3121c60db2eb218 (diff)
parent296c6bb21a6980f6e5b42f0790d6365c1e3f696f (diff)
downloadgit-5977744d045cacb809a3e3630dbbd28fe83976ae.zip
git-5977744d045cacb809a3e3630dbbd28fe83976ae.tar.gz
git-5977744d045cacb809a3e3630dbbd28fe83976ae.tar.bz2
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
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions