diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:57 -0700 |
commit | 5977744d045cacb809a3e3630dbbd28fe83976ae (patch) | |
tree | 276ab50231e80bf913148e421247a5a4ecf78653 /setup.c | |
parent | Merge branch 'by/diff-graph' (diff) | |
parent | diff: fix "git show -C -C" output when renaming a binary file (diff) | |
download | tgif-5977744d045cacb809a3e3630dbbd28fe83976ae.tar.xz |
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 'setup.c')
0 files changed, 0 insertions, 0 deletions