This depends on a merge of en/ort-conflict-handling, en/diffcore-rename, and en/ort-directory-rename. Changes since v2: * Add another step I forgot in my testcase setup -- setting merge.directoryRenames (noticed by Sangeeta); I've double checked that I didn't forget any other settings. Elijah Newren (1): merge-ort: begin performance work; instrument with trace2_region_* calls diffcore-rename.c | 8 +++++++ merge-ort.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) Range-diff: 1: 8783f209ef ! 1: 644f458c01 merge-ort: begin performance work; instrument with trace2_region_* calls @@ Commit message $ git mv drivers pilots # Introduce over 26,000 renames $ git commit -m "Rename drivers/ to pilots/" $ git config merge.renameLimit 30000 + $ git config merge.directoryRenames true === Testcases === -- 2.29.2.506.ga68ba46ed0.dirty