From: Junio C Hamano Date: Sun, 3 Apr 2016 17:29:33 +0000 (-0700) Subject: Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' X-Git-Tag: v2.9.0-rc0~167 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa3a2c2af600e6aea73df63c11a0eb88a00b6444?hp=--cc Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' 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 --- aa3a2c2af600e6aea73df63c11a0eb88a00b6444