| commit | d61e79050cd30231456740c3006aca94ed074db0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Jan 2015 19:38:32 +0000 (12 11:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Jan 2015 19:38:37 +0000 (12 11:38 -0800) | ||
| tree | c75683876cce895159851f64f11ceca4d2fc7a26 | treesnapshot (tar.gz zip) |
| parent | 97488abc91217d3ddb0f8fa4b14a51c2cfbde65d | commitdiff |
| parent | 8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 | commitdiff |
Merge branch 'rs/plug-strbuf-leak-in-merge'
* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()
* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()
| builtin/merge.c | diff1 | diff2 | blobhistory |