Sync with 2.4.2

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 27c3d73961dfc9b50c3eafc7360662076cb31260..2af1beec5f6f330072b3739e3c8b855f988173a9 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_expect_code 1 git merge "merge msg" B master
+       test_expect_code 1 git merge -m "merge msg" master
 '
 
 test_expect_success 'F/D conflict' '