aboutsummaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-07-17 12:30:51 -0700
committerIan Lance Taylor <iant@golang.org>2020-07-17 14:28:28 -0700
commitd5dfd4793febee6526e9ca84e06b5e207e0fbcee (patch)
tree67ee8ec7e6ad1697dfa1546524756140af9c8664 /libgo/MERGE
parentf1b6e46c417224887c2f21baa6d4c538a25fe9fb (diff)
downloadgcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.zip
gcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.tar.gz
gcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.tar.bz2
libgo: update to Go 1.14.6 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/243317
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 07547d0..4f85893 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-83b181c68bf332ac7948f145f33d128377a09c42
+edfd6f28486017dcb136cd3f3ec252706d4b326e
The first line of this file holds the git revision number of the
last merge done from the master library sources.