From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Nov 2025 18:32:40 +0000 (-0800)
Subject: Merge branch 'en/ort-rename-another-fix'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=716e871d50dc63a6f436442b127571b9268a75a3;p=rit

Merge branch 'en/ort-rename-another-fix'

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

716e871d50dc63a6f436442b127571b9268a75a3