| commit | c1fa85ff8ceae0e882d19b1548de407994ee4180 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2016 21:37:22 +0000 (26 13:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2016 21:37:22 +0000 (26 13:37 -0800) | ||
| tree | f292383fd2073b0d2315411471b10163fc396523 | treesnapshot (tar.gz zip) |
| parent | 1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881 | commitdiff |
| parent | 4867f1184c943f7738bb7b42cab2e62cf16cdb18 | commitdiff |
Merge branch 'ps/plug-xdl-merge-leak'
* 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 |