Update jk/maint-strbuf-missing-init to builtin/ rename

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 3aaec7bed76af9efdfe5647be0da64373db2011e..c6e3e7fdaf92dc94925283ee5470588625c7df48 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -46,7 +46,7 @@ static int show_diffstat = 1, option_log, squash;
 static int option_commit = 1, allow_fast_forward = 1;
 static int fast_forward_only;
 static int allow_trivial = 1, have_message;
-static struct strbuf merge_msg;
+static struct strbuf merge_msg = STRBUF_INIT;
 static struct commit_list *remoteheads;
 static unsigned char head[20], stash[20];
 static struct strategy **use_strategies;