| commit | 1a8bbbbd059390ee7d8a5f12f0402325aaf3326d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Jun 2010 05:15:48 +0000 (7 22:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Jun 2010 05:15:48 +0000 (7 22:15 -0700) | ||
| tree | 774c665891fe48539cf4240a4fa466c627a90aec | treesnapshot (tar.gz zip) |
| parent | 8771aaeb59053c8021ba12e5e6a63b311d252474 | commitdiff |
| parent | 296c6bb21a6980f6e5b42f0790d6365c1e3f696f | commitdiff |
Merge branch 'cc/maint-diff-CC-binary' into next
* 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 |
| t/t4015-diff-whitespace.sh | diff1 | diff2 | blobhistory |