Merge extensions correctly
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index 1750199..3d3e699 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -4884,6 +4884,7 @@
public override Builder MergeFrom(TestAllExtensions other) {
if (other == TestAllExtensions.DefaultInstance) return this;
+ this.MergeExtensionFields(other);
this.MergeUnknownFields(other.UnknownFields);
return this;
}
@@ -7597,6 +7598,7 @@
public override Builder MergeFrom(TestEmptyMessageWithExtensions other) {
if (other == TestEmptyMessageWithExtensions.DefaultInstance) return this;
+ this.MergeExtensionFields(other);
this.MergeUnknownFields(other.UnknownFields);
return this;
}
@@ -10714,6 +10716,7 @@
if (other.HasMyFloat) {
MyFloat = other.MyFloat;
}
+ this.MergeExtensionFields(other);
this.MergeUnknownFields(other.UnknownFields);
return this;
}