summaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/unittest_repeated_merge_nano.proto
AgeCommit message (Expand)AuthorFilesLines
2013-10-15Fix repeated field merging semantics.Max Cai1-0/+47