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