My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08e21c9 4867f11)
Merge branch 'ps/plug-xdl-merge-leak' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -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
The core git plumbing