Test merge 1

vuil · vuil · commit 60d812ff8744 · 2021-09-25T17:47:04.000-07:00
diff --git a/cmd/hello/main.go b/cmd/hello/main.go
@@ -17,4 +17,5 @@ func main() {
 	var log logr.Logger = zerologr.New(&zl)
 
 	log.Info("Logr in action!", "the answer", 42)
+	log.Info("Test merge : msg 1, take 3")
 }

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ func main() {`
`17`	`17`	`var log logr.Logger = zerologr.New(&zl)`
`18`	`18`
`19`	`19`	`log.Info("Logr in action!", "the answer", 42)`
	`20`	`+ log.Info("Test merge : msg 1, take 3")`
`20`	`21`	`}`