Merge branch 'lh/send-email-hide-x-mailer'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"