Merge branch 'ek/alt-odb-entry-fix'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"