From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Sep 2022 20:40:18 +0000 (-0700)
Subject: Merge branch 'en/merge-unstash-only-on-clean-merge'
X-Git-Tag: v2.38.0-rc0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a4779086deb12d406f819a619cc28924461f1a4;p=thirdparty%2Fgit.git

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

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
---

3a4779086deb12d406f819a619cc28924461f1a4