stash: invoke rerere in case of conflict

diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh
index 96be5236a2faf7178edc3c60094ecc37da741a65..c00c9b071d696038f63e8d613e11beab68eb547e 100755 (executable)
--- a/t/t5519-push-alternates.sh
+++ b/t/t5519-push-alternates.sh
@@ -123,7 +123,7 @@ test_expect_success 'bob works and pushes again' '
        (
                cd alice-pub &&
                git cat-file commit master >../bob-work/commit
-       )
+       ) &&
        (
                # This time Bob does not pull from Alice, and
                # the master branch at her public repository points