mergetools / vimdiff2on commit Merge branch 'ah/submodule-typofix-in-error' into maint (cfc3e0e)
   1. "$MERGE_TOOLS_DIR/vimdiff"