Merge branch 'et/spell-poll-infinite-with-minus-one-only'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"