]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/xdiff-alloc-fail'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2022 21:38:23 +0000 (13:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2022 21:38:23 +0000 (13:38 -0800)
commit47be28e51e6a3b390e694d868b7da04181e99e96
tree4199ccffac92de9a7b9c3eb6f7d99b2a51cf84e8
parent82386b44963f127d6dbe25d48889bde3149e177c
parent43ad3af380702d9e304140f259480de59320e587
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