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