| commit | 3c656899cdfbfdd40987625c4615a8c941d5968a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 16:04:14 +0000 (22 09:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 16:27:07 +0000 (22 09:27 -0700) | ||
| tree | 547b892074d90da576a25066e3504af9c60460f5 | treesnapshot (tar.gz zip) |
| parent | a8c4d925caba244de842f8fa663c3e6bb7000b89 | commitdiff |
| parent | 296c6bb21a6980f6e5b42f0790d6365c1e3f696f | commitdiff |
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
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
| diff.c | diff1 | diff2 | blobhistory |