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

Merge branch 'en/merge-multi-strategies'

The code that implements multi-strategy support in "git merge" has
been clean-up a bit.

* en/merge-multi-strategies:
  merge: small code readability improvement
  merge: cleanup confusing logic for handling successful merges
---

624a93623469b5165643a5e6c913666df46ab6c7