From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Mar 2022 21:38:23 +0000 (-0800)
Subject: Merge branch 'pw/xdiff-alloc-fail'
X-Git-Tag: v2.36.0-rc0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47be28e51e6a3b390e694d868b7da04181e99e96;p=thirdparty%2Fgit.git

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
---

47be28e51e6a3b390e694d868b7da04181e99e96