diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:26 -0800 |
commit | 54b1335ae3ced34310fbc2abc92431a2a7f1f7fa (patch) | |
tree | 49b8133bddfa6b9e045ea06db04230b31cc3154b /xdiff/xmerge.c | |
parent | Merge branch 'jt/decorate-api' (diff) | |
parent | transport-helper: plug strbuf and string_list leaks (diff) | |
download | tgif-54b1335ae3ced34310fbc2abc92431a2a7f1f7fa.tar.xz |
Merge branch 'rs/fmt-merge-msg-leakfix'
Leakfix.
* rs/fmt-merge-msg-leakfix:
transport-helper: plug strbuf and string_list leaks
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions