From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Nov 2025 18:58:45 +0000 (-0800)
Subject: Merge branch 'en/ort-rename-another-fix' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53d94af6b4be39ec4e6521403b33b1f1a435370a;p=thirdparty%2Fgit.git

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
---

53d94af6b4be39ec4e6521403b33b1f1a435370a