Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"