mergetools / gvimdiff3on commit Merge branch 'jk/send-email-ssl-errors' (7aaff08)
   1. "$MERGE_TOOLS_DIR/vimdiff"