mergetools / gvimdiffon commit Merge branch 'jk/send-email-ssl-errors' into maint (06b5c93)
   1. "$MERGE_TOOLS_DIR/vimdiff"