mergetools / vimdiff3on commit Merge branch 'es/grep-require-name-when-needed' into maint (518e874)
   1. "$MERGE_TOOLS_DIR/vimdiff"