aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/unittest_repeated_merge_nano.proto
Commit message (Expand)AuthorAgeFilesLines
* Fix repeated field merging semantics.Max Cai2013-10-151-0/+47