From 42f20102eff9b4e5cfad7cd21505a204df085418 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 27 Jan 2017 15:01:57 +0000
Subject: libgo: update to go1.8rc3

    Reviewed-on: https://go-review.googlesource.com/35844

From-SVN: r244981
---
 libgo/merge.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libgo/merge.sh')

diff --git a/libgo/merge.sh b/libgo/merge.sh
index c750a5d808b..bdf0043f12b 100755
--- a/libgo/merge.sh
+++ b/libgo/merge.sh
@@ -71,7 +71,9 @@ merge() {
   elif test -f ${old}; then
     # The file exists in the old version.
     if ! test -f ${libgo}; then
-      echo "merge.sh: $name: skipping: exists in old and new git, but not in libgo"
+      if ! cmp -s ${old} ${new}; then
+        echo "merge.sh: $name: skipping: exists in old and new git, but not in libgo"
+      fi
       continue
     fi
     if cmp -s ${old} ${libgo}; then
-- 
cgit v1.2.3