summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2021-08-19 12:29:54 -0700
committerIan Lance Taylor <iant@golang.org>2021-09-05 16:10:51 -0700
commit74df79ec3e0a1af87e2619fc07533aba58680f0a (patch)
tree321354569188d7b7de54cd23d3c6785030163cef /libgo/MERGE
parenta827909537cf085e5673ca7816b7bd7151d89fc5 (diff)
downloadgcc-74df79ec3e0a1af87e2619fc07533aba58680f0a.tar.gz
libgo: update to final Go 1.17 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/343729
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 4286d5c5433..d037d8d06a2 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-72ab3ff68b1ec894fe5599ec82b8849f3baa9d94
+ec5170397c724a8ae440b2bc529f857c86f0e6b1
The first line of this file holds the git revision number of the
last merge done from the master library sources.