Commit 0db932254741934afcdb04e644c31ff86db0d58c
2013-12-09T10:43:05
Fix GIT_MERGE_OPTS_INIT on MSVC.
diff --git a/include/git2/merge.h b/include/git2/merge.h
index 8a1dfec..610b0d5 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -85,7 +85,7 @@ typedef struct {
} git_merge_opts;
#define GIT_MERGE_OPTS_VERSION 1
-#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT}
+#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, (git_merge_flags_t)0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT}
/**