Merge branch 'mc/git-p4-prepare-p4-only'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"