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>
Junio C Hamano committed
Jan 28, 2010 at 00:41 UTC
df3dac3758e0b3e8178aff03fd0ceaf340735527
2 files changed
+2
-2
t/t4038-diff-combined.sh
+1
-1
@@ -76,7 +76,7 @@ test_expect_success 'check combined output (1)' '
76
verify_helper sidewithone
77
'
78
79
-test_expect_failure 'check combined output (2)' '
79
+test_expect_success 'check combined output (2)' '
80
git show sidesansone -- >sidesansone &&
81
verify_helper sidesansone
82
'
t/t6035-merge-dir-to-symlink.sh
+1
-1
@@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' '
48
git tag baseline
49
'
50
51
-test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' '
51
+test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '
52
git reset --hard &&
53
git checkout baseline^0 &&
54
git merge -s resolve master &&