| commit | 8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 | |
| author | René Scharfe <l.s.r@web.de> | |
| Wed, 24 Dec 2014 00:18:38 +0000 (24 01:18 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Dec 2014 17:33:25 +0000 (29 09:33 -0800) | ||
| tree | bcdd30a4cdfc456de9a65be59b44c36a1dc05ab8 | treesnapshot (tar.gz zip) |
| parent | bbcefffcea9789e4a1a2023a1c778e2c07db77a7 | commitdiff |
merge: release strbuf after use in suggest_conflicts()
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |