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

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

The ort merge machinery 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
---

2db806d817e2a0cfbd1c79cb67a84642f5544939