Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html