Merge pull request #5370 from phooijenga/patch-1

merge2: fix duplicate test case

Author: k8s-ci-robot

kyaml/yaml/merge2/scalar_test.go

@@ -110,7 +110,7 @@ kind: Deployment
 	{description: `remove scalar -- empty in src`,
 		source: `
 kind: Deployment
-field: null
+field:
 `,
 		dest: `
 kind: Deployment