summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-03-06 16:19:05 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-03-06 16:19:05 +0000
commitc271e224c2e6bcda1068754def0b0cfd6a2b2958 (patch)
tree122e64d46042099f2d5b39e31532f3d0358b5ad3 /libgo/MERGE
parent81b0d9065c3c832af6621e79e9d9b3c2bc684122 (diff)
libgo: Upgrade to Go 1.4.2 release.
From-SVN: r221245
Diffstat (limited to 'libgo/MERGE')
-rw-r--r--libgo/MERGE4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/MERGE b/libgo/MERGE
index 0e12671be4e..260f8cf8e59 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-14854533dcc7
+883bc6ed0ea815293fe6309d66f967ea60630e87
-The first line of this file holds the Mercurial revision number of the
+The first line of this file holds the git revision number of the
last merge done from the master library sources.