tree d90f4c1c5ec42bdb8dd8bf86d26f9d94b9463b51
parent 140323db76208a6d9ae2a69f58e4df4d17630007
author Bryan C. Mills <bcmills@google.com> 1528845949 -0400
committer Bryan C. Mills <bcmills@google.com> 1529003736 +0000

vendor/cmd/go: fix a bad merge from CL 117235

Apparently I need to learn to trust Gerrit less. It showed the correct diff, I
pressed Submit, and when I went to rebase the change was in the wrong place.

Updates golang/go#25501.

Change-Id: I85dfc9b57090bdd8ac888e705175c5397938405e
Reviewed-on: https://go-review.googlesource.com/118415
Reviewed-by: Russ Cox <rsc@golang.org>