diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-08 20:13:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-08 20:13:14 (GMT) |
| commit | bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5 (patch) | |
| tree | c00c99c6a153123393b25da11877b95d88f0483b /contrib/thunderbird-patch-inline | |
| parent | b9654bee995b1e6a2f106cd57e763854dbf06286 (diff) | |
| parent | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (diff) | |
| download | git-bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5.zip git-bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5.tar.gz git-bac92b1f39f7b670d7b2c32c892551aa3fb5b2e5.tar.bz2 | |
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 'contrib/thunderbird-patch-inline')
0 files changed, 0 insertions, 0 deletions