Merge branch 'tr/merge-edit-guidance'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 6eaecec906c49749237b243f772f2e33eb0efedd..c3555332366d687d04bfbc031b1be808f3caa802 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -172,8 +172,8 @@ test_expect_success 'fail when upstream arg is missing and not configured' '
 
 test_expect_success 'default to @{upstream} when upstream arg is missing' '
        git checkout -b default topic &&
-       git config branch.default.remote .
-       git config branch.default.merge refs/heads/master
+       git config branch.default.remote . &&
+       git config branch.default.merge refs/heads/master &&
        git rebase &&
        test "$(git rev-parse default~1)" = "$(git rev-parse master)"
 '