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

Browse Source

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

maint

Junio C Hamano 2016-02-26 13:37:22 -08:00

parent 1e4c08ff7e 4867f1184c

commit c1fa85ff8c