Merge branch 'sp/complete-ext-alias'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"