Commit 4d116c34132251134a5acbcebb5e30fd8d5c2f50
2014-03-06T16:08:12
Merge pull request #1997 from mgbowen/merge-options-init-fix Fix GIT_MERGE_OPTS_INIT on MSVC.
diff --git a/include/git2/merge.h b/include/git2/merge.h
index dc89a04..5e6c486 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -154,7 +154,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}
/**
* Initializes a `git_merge_opts` with default values. Equivalent to creating