mergetools / vimdiff3on commit Merge branch 'sb/mailsplit-dead-code-removal' (08668f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"