]> git.proxmox.com Git - libgit2.git/commit - tests/refs/branches/upstream.c
Merge pull request #1997 from mgbowen/merge-options-init-fix
authorVicent Marti <vicent@github.com>
Thu, 6 Mar 2014 15:08:12 +0000 (16:08 +0100)
committerVicent Marti <vicent@github.com>
Thu, 6 Mar 2014 15:08:12 +0000 (16:08 +0100)
commit4d116c34132251134a5acbcebb5e30fd8d5c2f50
tree3326ae19479368e0bf4032e2f371b96b27908e42
parentefc822ef0d8bb632f8ea5853321084193f5e95b9
parent0db932254741934afcdb04e644c31ff86db0d58c
Merge pull request #1997 from mgbowen/merge-options-init-fix

Fix GIT_MERGE_OPTS_INIT on MSVC.
include/git2/merge.h