commit 65611e5f7fc60e909529889c29faa9cac17cb485
author Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> Sat Dec 04 18:42:31 2021
committer GitHub <noreply@github.com> Sat Dec 04 18:42:31 2021
tree c2907c94acd02e108bdb8f5d7b3f7016b802169e
parent 5bc02fb48cd697f610bc9f0da227a5c4b3cad8da
parent 19f740457cdc857176c88977babc2317f6830369

Merge pull request #205 from jiahuif-forks/feature/merge-new-algorithm

new algorithm for structural merge

merge/real_test.go

diff --git a/merge/real_test.go b/merge/real_test.go
index 1136bbd..2974549 100644
--- a/merge/real_test.go
+++ b/merge/real_test.go
@@ -101,6 +101,21 @@
 					},
 				},
 				{
+					name: "ApplyTwice",
+					ops: []Operation{
+						Apply{
+							Manager:    "controller",
+							APIVersion: "v1",
+							Object:     bench.obj,
+						},
+						Apply{
+							Manager:    "other-controller",
+							APIVersion: "v1",
+							Object:     bench.obj,
+						},
+					},
+				},
+				{
 					name: "Update",
 					ops: []Operation{
 						Update{