Merge branch 'rs/opt-help-text'

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 490d3971142a87e940f3d27e7e7f068b276ff602..5d91d056d2ff97bb4253671cde8ac9a207bd6bd9 100755 (executable)
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -20,7 +20,9 @@ echo "file dir" > dir &&
 git add dir &&
 git commit -m "File: dir"'
 
-test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
+test_expect_success 'Merge with d/f conflicts' '
+       test_expect_code 1 git merge "merge msg" B master
+'
 
 test_expect_success 'F/D conflict' '
        git reset --hard &&