Jon Skeet cbe250591f Fix merging with message-valued oneof ... If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation.		2017-10-31 17:11:40 -07:00
..
unittest_custom_options_proto3.proto	Add Oneof custom options test	2017-01-27 11:52:32 -08:00
unittest_issues.proto	Fix merging with message-valued oneof	2017-10-31 17:11:40 -07:00