mergetools / gvimdiff2on commit Merge branch 'sb/submodule-helper-clone-regression-fix' into maint (f5e16b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"