Skip to content

G
git2
Commit 4a759bfb by Vicent Marti
Options

Merge pull request #2165 from libgit2/revert-1997 

Revert pull request #1997
parents 4d116c34 2ab6d2cd
Showing with 1 additions and 1 deletions
include/git2/merge.h
...@@ -154,7 +154,7 @@ typedef struct { ...@@ -154,7 +154,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, (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 * Initializes a `git_merge_opts` with default values. Equivalent to creating
......
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