proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 20:11:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GIT_MERGE_OPTS_INIT on MSVC.

Browse Source
This commit is contained in:
Matthew Bowen 2013-12-09 10:43:05 -05:00 committed by Matthew Bowen
parent 07c5dc84fd
commit 0db9322547
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

@ -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}
/** /**