Commit 2ab6d2cd47a9175faa8d9915751511d9490b03b9

Vicent Marti 2014-03-06T16:08:17

Revert pull request #1997

1
2
3
4
5
6
7
8
9
10
11
12
13
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