Added a C++-compatible GIT_MERGE_OPTS_INIT.