Re: [PATCH 1/2] merge: only apply autostash when appropriate

> 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 <newren@gmail.com>
> ---
> 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' '