From 8a529ca399ea583d25cd94b0cba632489740e6ac Mon Sep 17 00:00:00 2001
From: Phani Teja Marupaka <pmarupaka@google.com>
Date: Tue, 27 Apr 2021 23:53:54 -0700
Subject: [PATCH] Update merge3 with deafult GVKNN matcher

---
 cmd/config/internal/commands/merge3.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/config/internal/commands/merge3.go b/cmd/config/internal/commands/merge3.go
index a1ac5b3c5..5c48efc4e 100644
--- a/cmd/config/internal/commands/merge3.go
+++ b/cmd/config/internal/commands/merge3.go
@@ -46,12 +46,13 @@ type Merge3Runner struct {
 	path     bool
 }
 
-func (r *Merge3Runner) runE(c *cobra.Command, args []string) error {
+func (r *Merge3Runner) runE(_ *cobra.Command, _ []string) error {
+	matcher := filters.DefaultGVKNNMatcher{MergeOnPath: r.path}
 	err := filters.Merge3{
 		OriginalPath: r.ancestor,
 		UpdatedPath:  r.fromDir,
 		DestPath:     r.toDir,
-		MergeOnPath:  r.path,
+		Matcher:      &matcher,
 	}.Merge()
 	if err != nil {
 		return err