From: Junio C Hamano <gitster@pobox.com>
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: http://git.ipfire.org/?a=commitdiff_plain;h=aa3a2c2af600e6aea73df63c11a0eb88a00b6444;p=thirdparty%2Fgit.git

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