Fix merge conflict by adding optional label to proto2 unittest_lite.proto

zhangskz · zhangskz · commit f000b7e18fd6 · 2024-09-18T14:57:16.000-04:00
diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto
@@ -508,5 +508,5 @@ message RecursiveMessage {
 }
 
 message RecursiveGroup {
-  RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];
+  optional RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];
 }

Original file line number	Diff line number	Diff line change
`@@ -508,5 +508,5 @@ message RecursiveMessage {`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`message RecursiveGroup {`
`511`		`- RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];`
	`511`	`+ optional RecursiveGroup recurse = 1 [features.message_encoding = DELIMITED];`
`512`	`512`	`}`