]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/ort-rename-another-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Nov 2025 18:58:45 +0000 (10:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Nov 2025 18:58:45 +0000 (10:58 -0800)
commit53d94af6b4be39ec4e6521403b33b1f1a435370a
tree565aa9bb48c6dce8878efae84858293201d68119
parent35bff72b7571d318462987a122ade435dd0dc389
parenta562d90a350dcbddc8794809aef9608467022e34
Merge branch 'en/ort-rename-another-fix' into next

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