From 2ab6d2cd47a9175faa8d9915751511d9490b03b9 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Thu, 6 Mar 2014 16:08:17 +0100 Subject: [PATCH] Revert pull request #1997 --- include/git2/merge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/git2/merge.h b/include/git2/merge.h index 5e6c486fd..dc89a0482 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