| commit | df3dac3758e0b3e8178aff03fd0ceaf340735527 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jan 2010 08:41:52 +0000 (28 00:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jan 2010 08:41:52 +0000 (28 00:41 -0800) | ||
| tree | 0034e53144b06603d0a14d7bad514c3d37de4bbe | treesnapshot (tar.gz zip) |
| parent | 7c3932334ef57e78f8cd170e3337f218646d7077 | commitdiff |
tests: update tests that used to fail
"diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost
line at the beginning of the file is shown incorrectly, 2009-07-22), which
was actually the commit that introduced this test..
An error in "git merge -s resolve" t6035 tests was fixed by 730f728
(unpack-trees.c: look ahead in the index, 2009-09-20).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost
line at the beginning of the file is shown incorrectly, 2009-07-22), which
was actually the commit that introduced this test..
An error in "git merge -s resolve" t6035 tests was fixed by 730f728
(unpack-trees.c: look ahead in the index, 2009-09-20).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t4038-diff-combined.sh | diffblobblamehistory | |
| t/t6035-merge-dir-to-symlink.sh | diffblobblamehistory |