mergetools / gvimdiffon commit Merge branch 'tr/send-email-ssl' into maint (ac0835f)
   1. "$MERGE_TOOLS_DIR/vimdiff"