mergetools / gvimdiff2on commit MSVC: fix compile errors due to macro redefinitions (61542f7)
   1. "$MERGE_TOOLS_DIR/vimdiff"