From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Aug 2022 18:13:11 +0000 (-0700)
Subject: Merge branch 'js/ort-clean-up-after-failed-merge' into maint
X-Git-Tag: v2.37.3~10
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=c2d62d0c7d80b6af90a7ff63aa5909c56ea3b579

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

Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>

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

c2d62d0c7d80b6af90a7ff63aa5909c56ea3b579