Fix error during merge

davecheney · davecheney · commit ee4766c291f3 · 2019-01-05T21:50:40.000+11:00
Signed-off-by: Dave Cheney &lt;dave@cheney.net&gt;
diff --git a/stack.go b/stack.go
@@ -49,7 +49,7 @@ func (f Frame) format(w io.Writer, s fmt.State, verb rune) {
 			if file == "" {
 				file = "unknown"
 			}
-			io.WriteString(s, path.Base(file))
+			io.WriteString(w, path.Base(file))
 		}
 	case 'd':
 		io.WriteString(w, strconv.Itoa(runtime.Frame(f).Line))

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (f Frame) format(w io.Writer, s fmt.State, verb rune) {`
`49`	`49`	`if file == "" {`
`50`	`50`	`file = "unknown"`
`51`	`51`	`}`
`52`		`- io.WriteString(s, path.Base(file))`
	`52`	`+ io.WriteString(w, path.Base(file))`
`53`	`53`	`}`
`54`	`54`	`case 'd':`
`55`	`55`	`io.WriteString(w, strconv.Itoa(runtime.Frame(f).Line))`