summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2021-09-16 16:09:35 -0700
committerIan Lance Taylor <iant@golang.org>2021-09-16 16:48:19 -0700
commit54866f7a81a2af4a6097146a1c78bd09bb437883 (patch)
tree4de6eb05a5d33a651cc25dc13296f8e4b9876cba /libgo/MERGE
parent745781d24cd7562202687cfbe05597ee673d4537 (diff)
downloadgcc-54866f7a81a2af4a6097146a1c78bd09bb437883.tar.gz
libgo: update to go1.17.1 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/350414
Diffstat (limited to 'libgo/MERGE')
-rw-r--r--libgo/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/MERGE b/libgo/MERGE
index d037d8d06a2..4473f479d5f 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-ec5170397c724a8ae440b2bc529f857c86f0e6b1
+21a4e67ad58e3c4a7c5254f60cda5be5c3c450ff
The first line of this file holds the git revision number of the
last merge done from the master library sources.