Merge branch 'ls/http-ssl-cipher-list'

diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index f7b3518a32763aa0fbad1a245dad8f0a5d866126..e6a64816efef0e53018c7a56784d1af62602e9d3 100755 (executable)
--- a/t/t3504-cherry-pick-rerere.sh
+++ b/t/t3504-cherry-pick-rerere.sh
@@ -23,7 +23,7 @@ test_expect_success 'conflicting merge' '
 test_expect_success 'fixup' '
        echo foo-dev >foo &&
        git add foo && test_tick && git commit -q -m 4 &&
-       git reset --hard HEAD^
+       git reset --hard HEAD^ &&
        echo foo-dev >expect
 '
 
@@ -33,7 +33,7 @@ test_expect_success 'cherry-pick conflict' '
 '
 
 test_expect_success 'reconfigure' '
-       git config rerere.enabled false
+       git config rerere.enabled false &&
        git reset --hard
 '