X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=7d92e2064b97828ebd5209d97b1d49807149f212;hb=6c41e97557d94df7085e3c0cff247305c9401968;hp=138737624807389ccb903a5cd03840d63b7cbf6f;hpb=9ddb7ead5234d3a40f7222df482c9ec46f5413c9;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 138737624..7d92e2064 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -48,7 +48,7 @@ static int show_diffstat = 1, shortlog_len, squash;
 static int option_commit = 1, allow_fast_forward = 1;
 static int fast_forward_only, option_edit;
 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 struct strategy **use_strategies;
 static size_t use_strategies_nr, use_strategies_alloc;