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>
git-mirror · Dec 29, 2014 · 8d025b7 · 8d025b7
1 parent bbcefff
commit 8d025b7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -894,6 +894,7 @@ static int suggest_conflicts(void)
 
 	append_conflicts_hint(&msgbuf);
 	fputs(msgbuf.buf, fp);
+	strbuf_release(&msgbuf);
 	fclose(fp);
 	rerere(allow_rerere_auto);
 	printf(_("Automatic merge failed; "