Merge branch 'ps/plug-xdl-merge-leak'
authorJunio C Hamano <redacted>
Fri, 26 Feb 2016 21:37:22 +0000 (13:37 -0800)
committerJunio C Hamano <redacted>
Fri, 26 Feb 2016 21:37:22 +0000 (13:37 -0800)
* ps/plug-xdl-merge-leak:
  xdiff/xmerge: fix memory leak in xdl_merge

1  2 
xdiff/xmerge.c

diff --cc xdiff/xmerge.c
Simple merge
git clone https://git.99rst.org/PROJECT