Merge branch 'sb/submodule-parallel-fetch'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"