From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Jan 2026 12:54:18 +0000 (+0900)
Subject: Merge branch 'en/ort-recursive-d-f-conflict-fix' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883dcfc63e9919461b343a9f21c411752d32df39;p=thirdparty%2Fgit.git

Merge branch 'en/ort-recursive-d-f-conflict-fix' into next

The ort merge machinery was hit an assertion failure in a history
with criss-cross merges renamed a directory and a non-directory,
which has been corrected.

* en/ort-recursive-d-f-conflict-fix:
  merge-ort: fix corner case recursive submodule/directory conflict handling
---

883dcfc63e9919461b343a9f21c411752d32df39