From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Feb 2022 22:21:00 +0000 (-0800)
Subject: Merge branch 'en/plug-leaks-in-merge'
X-Git-Tag: v2.36.0-rc0~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c70b5e718749a64eb3a41ecb585bfb85f518878f;p=thirdparty%2Fgit.git

Merge branch 'en/plug-leaks-in-merge'

Leakfix.

* en/plug-leaks-in-merge:
  merge: fix memory leaks in cmd_merge()
  merge-ort: fix memory leak in merge_ort_internal()
---

c70b5e718749a64eb3a41ecb585bfb85f518878f