From: Ramkumar Ramachandra Date: Tue, 15 Nov 2011 16:59:38 GMT Subject: [PATCH 3/4] ll-merge: initialize default_opts const Message-ID: <1321376379-31750-4-git-send-email-artagnon@gmail.com> In-Reply-To: <1321376379-31750-1-git-send-email-artagnon@gmail.com> Signed-off-by: Ramkumar Ramachandra --- ll-merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ll-merge.c b/ll-merge.c index da59738..205aed3 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -351,7 +351,7 @@ int ll_merge(mmbuffer_t *result_buf, const struct ll_merge_options *opts) { static struct git_attr_check check[2]; - static const struct ll_merge_options default_opts; + static const struct ll_merge_options default_opts = {0, 0, 0, 0}; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; const struct ll_merge_driver *driver; -- 1.7.6.351.gb35ac.dirty