summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike JS. Choi <mkchoi212@icloud.com>2018-01-03 23:15:45 -0600
committerMike JS. Choi <mkchoi212@icloud.com>2018-01-03 23:15:45 -0600
commit92c55152e1bf77bfe2e62d36503352c8d4adfda8 (patch)
tree5de5f3fd4412c33d7622b67d35775db45c57efda
parenta6f86b929de1f0bb360adc47bff7a49f67baefd2 (diff)
Remove old diff toggle logic
-rw-r--r--main.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/main.go b/main.go
index 411f76e..cbc17a2 100644
--- a/main.go
+++ b/main.go
@@ -57,9 +57,6 @@ func parseInput(g *gocui.Gui, v *gocui.View) error {
Select(&conflict.All[cur], g, true)
case 'q':
globalQuit(g)
- // case 'z':
- // conflict.All[cur].ToggleDiff()
- // Select(&conflict.All[cur], g, false)
default:
PrintPrompt(g, color.Red(color.Regular, "[wasd] >>"))
consecutiveError++