From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Feb 2022 22:20:58 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-restart-optim-fix'
X-Git-Tag: v2.36.0-rc0~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87bfbd52e21b6e9373cd70fc148f09dcdad39f09;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-restart-optim-fix'

The merge-ort misbehaved when merge.renameLimit configuration is
set too low and failed to find all renames.

* en/merge-ort-restart-optim-fix:
  merge-ort: avoid assuming all renames detected
---

87bfbd52e21b6e9373cd70fc148f09dcdad39f09