proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-02 18:10:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix GIT_MERGE_OPTS_INIT on MSVC.
This commit is contained in:
Vicent Marti 2014-03-06 16:08:12 +01:00
commit 4d116c3413
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/merge.h
View File

@ -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