diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:11 -0700 |
| commit | c2d62d0c7d80b6af90a7ff63aa5909c56ea3b579 (patch) | |
| tree | 99027fb1fc3bc3c2764e65409b5d99028a86c10c /commit-graph.c | |
| parent | 4b2d41b0ad24301827be2bd494fe6cf63f76ad02 (diff) | |
| parent | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (diff) | |
Merge branch 'js/ort-clean-up-after-failed-merge' into maint
Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
* 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-graph.c')
0 files changed, 0 insertions, 0 deletions