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()

Junio C Hamano committed Feb 9, 2022 at 14:21 UTC c70b5e718749a64eb3a41ecb585bfb85f518878f

No changes.