Merge "[dev.cmdgo] all: merge master (9eee0ed) into dev.cmdgo" into dev.cmdgo

author Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)
author Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)
diff --cc src/cmd/go/internal/modload/load.go
Simple merge
diff --cc src/cmd/go/internal/modload/query.go
Simple merge
diff --cc src/cmd/go/internal/work/exec.go
Simple merge
author	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 30 Jul 2021 21:29:29 +0000 (21:29 +0000)
		1	2
src/cmd/go/internal/modload/load.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/go/internal/modload/query.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/go/internal/work/exec.go	patch \|	diff1 \|	diff2 \|	blob \| history