Merge branch 'aw/doc-smtp-ssl-cert-path'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"