Merge branch 'sb/submodule-config-cleanup' into next
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"