mergetools / vimdiff3on commit Merge branch 'mb/fast-import-delete-root' into maint (5b830a8)
   1. "$MERGE_TOOLS_DIR/vimdiff"