Merge pull request #1997 from mgbowen/merge-options-init-fix

Fix GIT_MERGE_OPTS_INIT on MSVC.

Merge pull request #1997 from mgbowen/merge-options-init-fix
Fix GIT_MERGE_OPTS_INIT on MSVC.
4d116c34 · Vicent Marti · efc822ef · 0db93225 · 4d116c34
Commit 4d116c34 authored Mar 06, 2014 by Vicent Marti
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

include/git2/merge.h
+1 -1

No files found.
--- 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