From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2022 20:13:14 +0000 (-0700)
Subject: Merge branch 'js/ort-clean-up-after-failed-merge'
X-Git-Tag: v2.38.0-rc0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5;p=thirdparty%2Fgit.git

Merge branch 'js/ort-clean-up-after-failed-merge'

Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.

* js/ort-clean-up-after-failed-merge:
  merge-ort: do leave trace2 region even if checkout fails
  merge-ort: clean up after failed merge
---

bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5