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>
René Scharfe committed
Dec 24, 2014 at 01:18 UTC
8d025b7cafdd976d1ba34fd8b2df8b669e1cd282
1 file changed
+1
builtin/merge.c
+1
@@ -894,6 +894,7 @@ static int suggest_conflicts(void)
894
895
append_conflicts_hint(&msgbuf);
896
fputs(msgbuf.buf, fp);
897
+ strbuf_release(&msgbuf);
898
fclose(fp);
899
rerere(allow_rerere_auto);
900
printf(_("Automatic merge failed; "