Merge branch 'sp/doc-update-index-cacheinfo'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"