From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Feb 2021 21:58:43 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-perf'
X-Git-Tag: v2.31.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3a035b055;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-perf'

The "ort" merge strategy.

* en/merge-ort-perf:
  merge-ort: begin performance work; instrument with trace2_region_* calls
  merge-ort: ignore the directory rename split conflict for now
  merge-ort: fix massive leak
---

d3a035b055c81634ce99ab5fa5476a52d33029fe