Commit 4d116c34132251134a5acbcebb5e30fd8d5c2f50

Vicent Marti 2014-03-06T16:08:12

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