Merge branch 'ob/imap-send-ssl-verify' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"