| commit | 4da402695d2998b4735dd219b03848b47d2389cf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2016 19:13:49 +0000 (10 11:13 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2016 19:13:49 +0000 (10 11:13 -0800) | ||
| tree | d1b7fe94cf64f1903e04b4b5d1658f0788402c8b | treesnapshot (tar.gz zip) |
| parent | 08e21c9b5f3996152080ff22d33d9d2866a3dc26 | commitdiff |
| parent | 4867f1184c943f7738bb7b42cab2e62cf16cdb18 | commitdiff |
Merge branch 'ps/plug-xdl-merge-leak' into maint
* ps/plug-xdl-merge-leak:
xdiff/xmerge: fix memory leak in xdl_merge
* ps/plug-xdl-merge-leak:
xdiff/xmerge: fix memory leak in xdl_merge
| xdiff/xmerge.c | diff1 | diff2 | blobhistory |