diff options
Diffstat (limited to 'libgo/merge.sh')
| -rwxr-xr-x | libgo/merge.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |