mergetools / vimdiff3on commit Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint (e591339)
   1. "$MERGE_TOOLS_DIR/vimdiff"