mergetools / vimdiff2on commit Merge branch 'rs/empty-archive' into maint (250ee16)
   1. "$MERGE_TOOLS_DIR/vimdiff"