Merge branch 'br/imap-send-via-libcurl'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"