diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:49 -0800 |
commit | 4da402695d2998b4735dd219b03848b47d2389cf (patch) | |
tree | d1b7fe94cf64f1903e04b4b5d1658f0788402c8b /t/test-lib.sh | |
parent | Merge branch 'ak/git-strip-extension-from-dashed-command' into maint (diff) | |
parent | xdiff/xmerge: fix memory leak in xdl_merge (diff) | |
download | tgif-4da402695d2998b4735dd219b03848b47d2389cf.tar.xz |
Merge branch 'ps/plug-xdl-merge-leak' into maint
* ps/plug-xdl-merge-leak:
xdiff/xmerge: fix memory leak in xdl_merge
Diffstat (limited to 't/test-lib.sh')
0 files changed, 0 insertions, 0 deletions