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

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

Junio C Hamano committed Feb 26, 2016 at 13:37 UTC c1fa85ff8ceae0e882d19b1548de407994ee4180

No changes.