]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2653223 b3106a8)
Merge branch 'en/ort-rename-another-fix' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2025 23:17:12 +0000 (15:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2025 23:17:13 +0000 (15:17 -0800)
Yet another corner case fix around renames in the "ort" merge
strategy.

* en/ort-rename-another-fix:
  merge-ort: fix failing merges in special corner case
  merge-ort: remove debugging crud
  t6429: update comment to mention correct tool


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.