Merge branch 'mz/pull-rebase-rebased'

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index bc9db1a0f0826b030abf8d275de2c252f36d1fd1..eec8f4e3edd85e350f5b8d8c86415317cce2aba1 100755 (executable)
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -24,7 +24,7 @@ test_expect_success 'prepare repository' '
 '
 
 test_expect_success 'Merge with d/f conflicts' '
-       test_must_fail git merge master
+       test_expect_code 1 git merge "merge msg" B master
 '
 
 test_expect_success 'F/D conflict' '
@@ -71,7 +71,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' '
        git commit -m deleted
 '
 
-test_expect_failure 'modify/delete + directory/file conflict' '
+test_expect_success 'modify/delete + directory/file conflict' '
        git checkout delete^0 &&
        test_must_fail git merge modify &&
 
@@ -83,7 +83,7 @@ test_expect_failure 'modify/delete + directory/file conflict' '
        test -f letters~modify
 '
 
-test_expect_failure 'modify/delete + directory/file conflict; other way' '
+test_expect_success 'modify/delete + directory/file conflict; other way' '
        git reset --hard &&
        git clean -f &&
        git checkout modify^0 &&