Skip to content

G
git2
Commit 0db93225 by Matthew Bowen Committed by Matthew Bowen
Options

Fix GIT_MERGE_OPTS_INIT on MSVC.

parent 07c5dc84
Showing with 1 additions and 1 deletions
include/git2/merge.h
...@@ -85,7 +85,7 @@ typedef struct { ...@@ -85,7 +85,7 @@ typedef struct {
} git_merge_opts; } git_merge_opts;
#define GIT_MERGE_OPTS_VERSION 1 #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}
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment