Remove diff option for now

mkchoi212 · Jan 1, 2018 · 6fd77f4 · 6fd77f4
1 parent f94e86c
commit 6fd77f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/conflict/conflict.go b/conflict/conflict.go
@@ -1,10 +1,7 @@
 package conflict
 
 import (
-	"strings"
-
 	"github.com/mkchoi212/fac/color"
-	"github.com/sergi/go-diff/diffmatchpatch"
 )
 
 // Conflict represents a single conflict that may have occured
@@ -88,9 +85,3 @@ func In(fname string) (list []Conflict) {
 	}
 	return
 }
-
-func (c *Conflict) Diff() []string {
-	dmp := diffmatchpatch.New()
-	diffs := dmp.DiffMain(strings.Join(c.CurrentLines, ""), strings.Join(c.ForeignLines, ""), false)
-	return []string{dmp.DiffPrettyText(diffs)}
-}
diff --git a/main.go b/main.go
@@ -57,9 +57,9 @@ func parseInput(g *gocui.Gui, v *gocui.View) error {
 			Select(&conflict.All[cur], g, true)
 		case in == 'q':
 			globalQuit(g)
-		case in == 'z':
-			conflict.All[cur].ToggleDiff()
-			Select(&conflict.All[cur], g, false)
+		// case in == 'z':
+		//	conflict.All[cur].ToggleDiff()
+		//	Select(&conflict.All[cur], g, false)
 		default:
 			PrintPrompt(g, color.Red(color.Regular, "[wasd] >>"))
 			consecutiveError++

diff --git a/summary.go b/summary.go
@@ -17,7 +17,6 @@ func printHelp(v *gocui.View) {
 	s - show more lines down
 	a - select left screen
 	d - select right screen
-	z - toggle diff
 
 	j - scroll down
 	k - scroll up