Merge branch 'ps/plug-xdl-merge-leak' into maint
commit4da402695d2998b4735dd219b03848b47d2389cf
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (10 11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (10 11:13 -0800)
treed1b7fe94cf64f1903e04b4b5d1658f0788402c8b
parent08e21c9b5f3996152080ff22d33d9d2866a3dc26
parent4867f1184c943f7738bb7b42cab2e62cf16cdb18
Merge branch 'ps/plug-xdl-merge-leak' into maint

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