diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-06 16:08:12 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-06 16:08:12 +0100 |
| commit | 4d116c34132251134a5acbcebb5e30fd8d5c2f50 (patch) | |
| tree | 3326ae19479368e0bf4032e2f371b96b27908e42 /include/git2/merge.h | |
| parent | efc822ef0d8bb632f8ea5853321084193f5e95b9 (diff) | |
| parent | 0db932254741934afcdb04e644c31ff86db0d58c (diff) | |
| download | libgit2-4d116c34132251134a5acbcebb5e30fd8d5c2f50.tar.gz | |
Merge pull request #1997 from mgbowen/merge-options-init-fix
Fix GIT_MERGE_OPTS_INIT on MSVC.
Diffstat (limited to 'include/git2/merge.h')
| -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 dc89a0482..5e6c486fd 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 |