diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-03-09 13:38:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-09 13:38:23 -0800 |
| commit | 47be28e51e6a3b390e694d868b7da04181e99e96 (patch) | |
| tree | 4199ccffac92de9a7b9c3eb6f7d99b2a51cf84e8 /git-merge-one-file.sh | |
| parent | Merge branch 'en/present-despite-skipped' (diff) | |
| parent | xdiff: handle allocation failure when merging (diff) | |
| download | tgif-47be28e51e6a3b390e694d868b7da04181e99e96.tar.xz | |
Merge branch 'pw/xdiff-alloc-fail'
Improve failure case behaviour of xdiff library when memory
allocation fails.
* pw/xdiff-alloc-fail:
xdiff: handle allocation failure when merging
xdiff: refactor a function
xdiff: handle allocation failure in patience diff
xdiff: fix a memory leak
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions