mergetools / vimdiff3on commit Merge branch 'rd/send-email-2047-fix' (948e814)
   1. "$MERGE_TOOLS_DIR/vimdiff"