From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2016 21:37:22 +0000 (-0800)
Subject: Merge branch 'ps/plug-xdl-merge-leak'
X-Git-Tag: v2.8.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1fa85ff8ceae0e882d19b1548de407994ee4180;p=thirdparty%2Fgit.git

Merge branch 'ps/plug-xdl-merge-leak'

* ps/plug-xdl-merge-leak:
  xdiff/xmerge: fix memory leak in xdl_merge
---

c1fa85ff8ceae0e882d19b1548de407994ee4180