Commit 0db932254741934afcdb04e644c31ff86db0d58c

Matthew Bowen 2013-12-09T10:43:05

Fix GIT_MERGE_OPTS_INIT on MSVC.