]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 512351f 979ee83)
Merge branch 'en/ort-recursive-d-f-conflict-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Jan 2026 07:40:12 +0000 (16:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Jan 2026 07:40:12 +0000 (16:40 +0900)
commit2db806d817e2a0cfbd1c79cb67a84642f5544939
treecf870cfc73ebb194410410db37084e2cf97bf68ctree | snapshot
parent512351f2a84388d223ee6bb763ce5e6c5965f1b8commit | diff
parent979ee83e8a908f920d097c10cea5f8857e10898fcommit | diff
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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.