Colorize diff3 separator marker

README.md

@@ -8,7 +8,7 @@
 </p>
 <br>
 
-I never really liked any of the `mergetools` out there so I made a simple program that does simple things… in a simple fashion.
+I never really liked any of the `mergetools` out there so I made a program that is somewhat easy to use.
 
 ![](./assets/overview.png)
 
@@ -29,8 +29,6 @@ brew install fac
 
 ## 🔧 Using
 
-> **Please note fac does NOT support diff3 merge conflict outputs yet!**
-
 `fac` operates much like `git add -p` . It has a prompt input at the bottom of the screen where the user inputs various commands.
 
 The commands have been preset to the following specifications

conflict/parse.go

@@ -15,6 +15,7 @@ import (
 	"github.com/alecthomas/chroma/formatters"
 	"github.com/alecthomas/chroma/lexers"
 	"github.com/alecthomas/chroma/styles"
+	"github.com/mkchoi212/fac/color"
 )
 
 var FileLines map[string][]string
@@ -45,21 +46,27 @@ func (c *Conflict) HighlightSyntax() error {
 	var it chroma.Iterator
 	var err error
 	buf := new(bytes.Buffer)
+	var colorLine string
 
 tokenizer:
 	for i, block := range [][]string{c.LocalLines, c.IncomingLines} {
 		for _, line := range block {
-			if it, err = lexer.Tokenise(nil, line); err != nil {
-				break tokenizer
-			}
-			if err = formatter.Format(buf, style, it); err != nil {
-				break tokenizer
+			if IdentifyStyle(line) == diff3 {
+				colorLine = color.Red(color.Regular, line)
+			} else {
+				if it, err = lexer.Tokenise(nil, line); err != nil {
+					break tokenizer
+				}
+				if err = formatter.Format(buf, style, it); err != nil {
+					break tokenizer
+				}
+				colorLine = buf.String()
 			}
 
 			if i == 0 {
-				c.ColoredLocalLines = append(c.ColoredLocalLines, buf.String())
+				c.ColoredLocalLines = append(c.ColoredLocalLines, colorLine)
 			} else {
-				c.ColoredIncomingLines = append(c.ColoredIncomingLines, buf.String())
+				c.ColoredIncomingLines = append(c.ColoredIncomingLines, colorLine)
 			}
 			buf.Reset()
 		}

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/jroimartin/gocui"
@@ -88,8 +89,7 @@ func parseInput(g *gocui.Gui, v *gocui.View) error {
 }
 
 func main() {
-	//cwd, _ := os.Getwd()
-	cwd := "./assets/dummy_repo"
+	cwd, _ := os.Getwd()
 	conflicts, err := conflict.Find(cwd)
 	if err != nil {
 		fmt.Println(color.Red(color.Regular, err.Error()))