mergetools / vimdiff3on commit Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maint (f381e42)
   1. "$MERGE_TOOLS_DIR/vimdiff"