Commit 4a759bfbcfbf4a5e8e0c734687578ffe34d2ca87
2014-03-06T16:08:36
Merge pull request #2165 from libgit2/revert-1997 Revert pull request #1997
diff --git a/include/git2/merge.h b/include/git2/merge.h
index 5e6c486..dc89a04 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, (git_merge_flags_t)0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT}
+#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT}
/**
* Initializes a `git_merge_opts` with default values. Equivalent to creating