From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 May 2026 13:58:30 +0000 (+0900)
Subject: Merge branch 'en/ort-cached-rename-with-trivial-resolution'
X-Git-Tag: v2.55.0-rc0~102
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3cfbb7b3f79ed99690d86c112f233723423d1baf;p=thirdparty%2Fgit.git

Merge branch 'en/ort-cached-rename-with-trivial-resolution'

"ort" merge backend improvements.

* en/ort-cached-rename-with-trivial-resolution:
  merge-ort: handle cached rename & trivial resolution interaction better
---

3cfbb7b3f79ed99690d86c112f233723423d1baf