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>
1 file changed
tree: d90f4c1c5ec42bdb8dd8bf86d26f9d94b9463b51
  1. vendor/
  2. AUTHORS
  3. codereview.cfg
  4. CONTRIBUTING.md
  5. CONTRIBUTORS
  6. LICENSE
  7. main.go
  8. PATENTS
  9. README.md
README.md

Versioned Go Prototype (vgo)

This repository holds a prototype of what the go command might look like with integrated support for package versioning.

See research.swtch.com/vgo for documents about the design.

Download/Install

Use go get -u golang.org/x/vgo.

You can also manually git clone the repository to $GOPATH/src/golang.org/x/vgo.

Report Issues / Send Patches

See CONTRIBUTING.md.

This is still a very early prototype. You are likely to run into bugs. Please file bugs in the main Go issue tracker, golang.org/issue, and put the prefix x/vgo: in the issue title.

Thank you.