]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c70bc33 6046f7a)
Merge branch 'en/plug-leaks-in-merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
commitc70b5e718749a64eb3a41ecb585bfb85f518878f
tree9357d8fc7ab58455239d398e497b087f07116f1etree | snapshot
parentc70bc338e9a35b45263c3c68913ad516e9e70d62commit | diff
parent6046f7a91c3bf5c76702f10a4a83e8a63afe2fb4commit | diff
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()
builtin/merge.c diff1 | diff2 | blob | history
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.