summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-11-20 15:19:29 -0800
committerIan Lance Taylor <iant@golang.org>2020-11-20 17:09:30 -0800
commitdec42fe4e3669409383d44d69a5992cd0c50fdb0 (patch)
treeecf4e3687f27e314879254b361bd7756d211a1ac /libgo/MERGE
parent82e5048e70ef790559ba768132b4afd266a30fee (diff)
downloadgcc-dec42fe4e3669409383d44d69a5992cd0c50fdb0.tar.gz
libgo: update to Go 1.15.5 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/272146
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 ad239c92fa9..b753907837d 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-0e953add9656c32a788e06438cd7b533e968b7f8
+c53315d6cf1b4bfea6ff356b4a1524778c683bb9
The first line of this file holds the git revision number of the
last merge done from the master library sources.