Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ps/plug-xdl-merge-leak' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000
(11:13 -0800)
committer
Junio 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
raw
|
combined
(merge:
08e21c9
4867f11
)
diff --cc
xdiff/xmerge.c
Simple merge