From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2022 19:52:55 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'
X-Git-Tag: v2.35.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c5410480ea7ea92e39667fedc8eba1f7a95bc9e;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'

A corner case bug in the ort merge strategy has been corrected.

* en/merge-ort-renorm-with-rename-delete-conflict-fix:
  merge-ort: fix bug with renormalization and rename/delete conflicts
---

2c5410480ea7ea92e39667fedc8eba1f7a95bc9e