From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Mar 2022 05:25:31 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-plug-leaks'
X-Git-Tag: v2.36.0-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae59346f096253bcdea2269426c391ae681fe943;p=thirdparty%2Fgit.git

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

Leakfix.

* en/merge-ort-plug-leaks:
  merge-ort: fix small memory leak in unique_path()
  merge-ort: fix small memory leak in detect_and_process_renames()
---

ae59346f096253bcdea2269426c391ae681fe943