]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e4c08f 4867f11)
Merge branch 'ps/plug-xdl-merge-leak'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:22 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
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 patch | diff1 | diff2 | blob | history

diff --cc xdiff/xmerge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.