Fix GIT_MERGE_OPTS_INIT on MSVC.

0db93225 · Matthew Bowen · Matthew Bowen · 07c5dc84 · 0db93225
Commit 0db93225 authored Dec 09, 2013 by Matthew Bowen Committed by Matthew Bowen Dec 09, 2013
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
@@ -85,7 +85,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}


 /**