mergetools / gvimdiff3on commit Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint (b8f7239)
   1. "$MERGE_TOOLS_DIR/vimdiff"