summaryrefslogtreecommitdiff
path: root/t/t4138-apply-ws-expansion.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-08 20:13:14 (GMT)
commitbac92b1f39f7b670d7b2c32c892551aa3fb5b2e5 (patch)
treec00c99c6a153123393b25da11877b95d88f0483b /t/t4138-apply-ws-expansion.sh
parentb9654bee995b1e6a2f106cd57e763854dbf06286 (diff)
parent1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (diff)
downloadgit-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 't/t4138-apply-ws-expansion.sh')
0 files changed, 0 insertions, 0 deletions