Merge branch 'maint'

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index b129f1dbd5a5ffe4413ea359f3e893e935117115..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' '