On Sat, Aug 20, 2022 at 9:53 PM Eric Sunshine [off-list ref] wrote:

On Sun, Aug 21, 2022 at 12:41 AM Elijah Newren via GitGitGadget
[off-list ref] wrote:

quoted

If a merge failed and we are leaving conflicts in the working directory
for the user to resolve, we should not attempt to apply any autostash.

Further, if we fail to apply the autostash (because either the merge
failed, or the user requested --no-commit), then we should instruct the
user how to apply it later.

Add a testcase verifying we have corrected this behavior.

Signed-off-by: Elijah Newren <redacted>
---

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh

@@ -255,6 +255,15 @@ test_expect_success 'merge --squash c3 with c7' '
+test_expect_success 'merge --squash --autostash conflict does not attempt to play autostash' '

Did you mean s/play/apply/ ?

Yep; will fix.