stash: invoke rerere in case of conflict

diff --git a/git-stash.sh b/git-stash.sh
index fe4ab28b2e10f85b20ff7892663cbb141fad4723..63d2f59fe528100554161a303f9dbf5a9d748600 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -469,6 +469,7 @@ apply_stash () {
        else
                # Merge conflict; keep the exit status from merge-recursive
                status=$?
+               git rerere
                if test -n "$INDEX_OPTION"
                then
                        gettextln "Index was not unstashed." >&2