diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-06 16:08:17 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-06 16:08:17 +0100 |
| commit | 2ab6d2cd47a9175faa8d9915751511d9490b03b9 (patch) | |
| tree | 942fc712d3df5cec7a8ad04979e0317b1a9a9afa | |
| parent | 4d116c34132251134a5acbcebb5e30fd8d5c2f50 (diff) | |
| download | libgit2-revert-1997.tar.gz | |
Revert pull request #1997revert-1997
| -rw-r--r-- | include/git2/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |