From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 May 2023 17:13:34 +0000 (-0700)
Subject: Merge branch 'en/ort-finalize-after-0-merges-fix'
X-Git-Tag: v2.41.0-rc0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39273126017b287028f7d661ef455a0a0fe20880;p=thirdparty%2Fgit.git

Merge branch 'en/ort-finalize-after-0-merges-fix'

A small API fix to the ort merge strategy backend.

* en/ort-finalize-after-0-merges-fix:
  merge-ort: fix calling merge_finalize() with no intermediate merge
---

39273126017b287028f7d661ef455a0a0fe20880