mergetools / gvimdiff2on commit cherry-pick: add t3512 for submodule updates (283f56a)
   1. "$MERGE_TOOLS_DIR/vimdiff"