Merge branch 'ps/plug-xdl-merge-leak' into maint
* ps/plug-xdl-merge-leak: xdiff/xmerge: fix memory leak in xdl_merge
Junio C Hamano committed
Mar 10, 2016 at 11:13 UTC
4da402695d2998b4735dd219b03848b47d2389cf
No changes.