summaryrefslogtreecommitdiff
path: root/t/t4038-diff-combined.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-28 00:41:52 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-28 00:41:52 -0800
commitdf3dac3758e0b3e8178aff03fd0ceaf340735527 (patch)
tree0034e53144b06603d0a14d7bad514c3d37de4bbe /t/t4038-diff-combined.sh
parent7c3932334ef57e78f8cd170e3337f218646d7077 (diff)
downloadgit-df3dac3758e0b3e8178aff03fd0ceaf340735527.tar.gz
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>
Diffstat (limited to 't/t4038-diff-combined.sh')
-rwxr-xr-xt/t4038-diff-combined.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index 2cf7e01ac2..7584efa36b 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -76,7 +76,7 @@ test_expect_success 'check combined output (1)' '
verify_helper sidewithone
'
-test_expect_failure 'check combined output (2)' '
+test_expect_success 'check combined output (2)' '
git show sidesansone -- >sidesansone &&
verify_helper sidesansone
'