Fix GIT_MERGE_OPTS_INIT on MSVC.
Merge pull request #1997 from mgbowen/merge-options-init-fix

Fix GIT_MERGE_OPTS_INIT on MSVC.