From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Sep 2022 19:21:11 +0000 (-0700)
Subject: Merge branch 'en/merge-unstash-only-on-clean-merge' into maint
X-Git-Tag: v2.38.0-rc0~11^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=2c75b3255b1d1f525c7c61b540b99af1ad84e8f8

Merge branch 'en/merge-unstash-only-on-clean-merge' into maint

The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.

* en/merge-unstash-only-on-clean-merge:
  merge: only apply autostash when appropriate
---

2c75b3255b1d1f525c7c61b540b99af1ad84e8f8