fix merge compile var name (#4)

* fix merge compile var name
solo-io · May 1, 2020 · fea508f · fea508f
1 parent 3f88644
commit fea508f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/merge/msg.go b/templates/merge/msg.go
@@ -1,9 +1,9 @@
 package merge
 
 const msgTpl = `
-// Merge non-nil fields from m2 into m
+// Merge non-nil fields from overrides into m
 func (m {{ (msgTyp .).Pointer }}) Merge(overrides {{ (msgTyp .).Pointer }}) {
-	if m == nil || m2 == nil { return }
+	if m == nil || overrides == nil { return }
 
 	{{ range .NonOneOfFields }}
 		{{ renderField . }}