diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:56 -0700 |
commit | a379f25462639eb95b05133c84374558a23bc7b0 (patch) | |
tree | bb5087a3668b2c18af771f69399731fd3fae6053 /builtin/merge.c | |
parent | Merge branch 'sb/test-bitmap-free-at-end' into maint (diff) | |
parent | line-log.c: fix a memleak (diff) | |
download | tgif-a379f25462639eb95b05133c84374558a23bc7b0.tar.xz |
Merge branch 'sb/line-log-plug-pairdiff-leak' into maint
* sb/line-log-plug-pairdiff-leak:
line-log.c: fix a memleak
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions