| commit | c70b5e718749a64eb3a41ecb585bfb85f518878f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Feb 2022 22:21:00 +0000 (9 14:21 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Feb 2022 22:21:00 +0000 (9 14:21 -0800) | ||
| tree | 9357d8fc7ab58455239d398e497b087f07116f1e | treesnapshot (tar.gz zip) |
| parent | c70bc338e9a35b45263c3c68913ad516e9e70d62 | commitdiff |
| parent | 6046f7a91c3bf5c76702f10a4a83e8a63afe2fb4 | commitdiff |
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()
Leakfix.
* en/plug-leaks-in-merge:
merge: fix memory leaks in cmd_merge()
merge-ort: fix memory leak in merge_ort_internal()
| builtin/merge.c | diff1 | diff2 | blobhistory |
| merge-ort.c | diff1 | diff2 | blobhistory |