diff options
| -rwxr-xr-x | git-stash.sh | 1 | ||||
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh index fe4ab28b2e..63d2f59fe5 100755 --- 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 diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 725f316861..6fa0c70506 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -203,7 +203,7 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' ' git reset --hard ' -test_expect_failure 'conflicted stash sets up rerere' ' +test_expect_success 'conflicted stash sets up rerere' ' git config rerere.enabled true && git checkout stash1 && echo "Conflicting stash content" >file11 && |