]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1d712e 979ee83)
Merge branch 'en/ort-recursive-d-f-conflict-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Jan 2026 12:54:18 +0000 (21:54 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Jan 2026 12:54:18 +0000 (21:54 +0900)
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

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.