stash: invoke rerere in case of conflict

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index da25bc2d1fb3a68b1d29b1a5b3f5d18f6c0ffdca..2af8947eebb3e9ee45f83acb398335ec163a521c 100755 (executable)
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -95,7 +95,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
        b
        : diffstat
        n
-       / [0-9]* files changed/ {
+       / [0-9]* files* changed/ {
                a\\
        DIFFSTAT
                b
@@ -179,11 +179,7 @@ test_expect_success 'request names an appropriate branch' '
                read repository &&
                read branch
        } <digest &&
-       {
-               test "$branch" = full ||
-               test "$branch" = master ||
-               test "$branch" = for-upstream
-       }
+       test "$branch" = tags/full
 
 '