mergetools / vimdiff2on commit Merge branch 'js/mingw-full-version-in-resources' into maint (40bc898)
   1. "$MERGE_TOOLS_DIR/vimdiff"