diff options
Diffstat (limited to 'src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs')
-rw-r--r-- | src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index 796d74a8..88e10f6c 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -194,6 +194,7 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(TestMessageSet other) { if (other == TestMessageSet.DefaultInstance) return this; + this.MergeExtensionFields(other); this.MergeUnknownFields(other.UnknownFields); return this; } |