mergetools / vimdiff2on commit Merge branch 'jk/mailsplit-maildir-muttsort' into maint (ece12fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"