Merge branch 'mn/send-email-works-with-credential'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"