]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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


Trivial merge