diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4038-diff-combined.sh | 2 | ||||
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 2cf7e01..7584efa 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 ' diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index d1b2287..3202e1d 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' ' git tag baseline ' -test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' ' +test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' ' git reset --hard && git checkout baseline^0 && git merge -s resolve master && |