Merge branch 'jc/send-email-sensible-encoding'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"