Print highlighted versions of code

mkchoi212 · Dec 28, 2017 · 7151bee · 7151bee
1 parent 7810a0b
commit 7151bee
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -85,14 +85,14 @@ func selectConflict(i int, g *gocui.Gui) error {
 			return err
 		}
 		v.Title = conf.CurrentName
-		printLines(v, conf.CurrentLines)
+		printLines(v, conf.ColoredCurrentLines)
 
 		v, err = g.View("foreign")
 		if err != nil {
 			return err
 		}
 		v.Title = conf.ForeignName
-		printLines(v, conf.ForeignLines)
+		printLines(v, conf.ColoredForeignLines)
 		return nil
 	})