]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit883dcfc63e9919461b343a9f21c411752d32df39
tree06dc0974cef4b77249dc080ac3b63eb1c0540c2atree | snapshot
parentd1d712e288766a72fee67ca80b43100301419a57commit | diff
parent979ee83e8a908f920d097c10cea5f8857e10898fcommit | diff
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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.