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