From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 19:13:49 +0000 (-0800)
Subject: Merge branch 'ps/plug-xdl-merge-leak' into maint
X-Git-Tag: v2.7.3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4da402695d2998b4735dd219b03848b47d2389cf;p=thirdparty%2Fgit.git

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

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

4da402695d2998b4735dd219b03848b47d2389cf