Add diffing library

mkchoi212 · Dec 29, 2017 · 4faa632 · 4faa632
1 parent 84cfcee
commit 4faa632
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/diff.go b/diff.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/sergi/go-diff/diffmatchpatch"
+)
+
+func (c *Conflict) Diff() {
+	dmp := diffmatchpatch.New()
+	diffs := dmp.DiffMain(strings.Join(c.CurrentLines, "\n"), strings.Join(c.ForeignLines, "\n"), false)
+	fmt.Println(dmp.DiffPrettyText(diffs))
+}