From: Junio C Hamano Date: Fri, 15 Apr 2016 01:57:45 +0000 (-0700) Subject: Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint X-Git-Tag: v2.8.2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=183ecc3e49dee55de349e2f0759aa4894b3623c7;p=thirdparty%2Fgit.git Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint A small memory leak in an error codepath has been plugged in xdiff code. * rj/xdiff-prepare-plug-leak-on-error-codepath: xdiff/xprepare: fix a memory leak xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits --- 183ecc3e49dee55de349e2f0759aa4894b3623c7