mergetools / vimdiff3on commit Merge branch 'jw/send-email-no-auth' (8ac6990)
   1. "$MERGE_TOOLS_DIR/vimdiff"