mergetools / vimdiff2on commit Merge branch 'np/send-email-header-parsing' (fbc615b)
   1. "$MERGE_TOOLS_DIR/vimdiff"