| commit | 90b23e5f21e101f14da60375e4bda265a677e209 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 09:08:02 +0000 (27 01:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 09:08:02 +0000 (27 01:08 -0800) | ||
| tree | effeccd13890741e6f0d5bafabd65be2c0d92551 | treesnapshot (tar.gz zip) |
| parent | 5c415311f743ccb11a50f350ff1c385778f049d6 | commitdiff |
| parent | b67b9612e1a90ae093445abeaeff930e9f4cf936 | commitdiff |
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo
This is an evil merge, as a test added since 1.6.0 expects an incorrect
behaviour the merged commit fixes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This is an evil merge, as a test added since 1.6.0 expects an incorrect
behaviour the merged commit fixes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff.c | diff1 | diff2 | blobhistory |
| t/t4030-diff-textconv.sh | diff1 | blobhistory |