diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-08-08 13:13:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-08 13:13:14 -0700 |
commit | bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5 (patch) | |
tree | c00c99c6a153123393b25da11877b95d88f0483b /commit.c | |
parent | b9654bee995b1e6a2f106cd57e763854dbf06286 (diff) | |
parent | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (diff) |
Merge branch 'js/ort-clean-up-after-failed-merge'
Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
* js/ort-clean-up-after-failed-merge:
merge-ort: do leave trace2 region even if checkout fails
merge-ort: clean up after failed merge
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions