| commit | e182aafb024b07fe021c8311f4c42ef0772c058d | [log] [tgz] |
|---|---|---|
| author | David Symonds <dsymonds@golang.org> | Wed Jan 30 17:04:37 2013 +1100 |
| committer | David Symonds <dsymonds@golang.org> | Wed Jan 30 17:04:37 2013 +1100 |
| tree | ebdf632b15a2200be92377e932cbbcccff98221b | |
| parent | d4b52d086a92105fedd020308f70d4c643ee6854 [diff] [blame] |
goprotobuf: Add Merge. R=adg CC=golang-dev https://codereview.appspot.com/7227053
diff --git a/proto/all_test.go b/proto/all_test.go index c3b2378..9c9cf0f 100644 --- a/proto/all_test.go +++ b/proto/all_test.go
@@ -1427,7 +1427,7 @@ } } -func TestMerge(t *testing.T) { +func TestMergeMessages(t *testing.T) { pb := &MessageList{Message: []*MessageList_Message{{Name: String("x"), Count: Int32(1)}}} data, err := Marshal(pb) if err != nil {