mergetools / gvimdiffon commit Merge branch 'ob/imap-send-ssl-verify' into maint (2a5964a)
   1. "$MERGE_TOOLS_DIR/vimdiff"