From 001ea1002d4afc3beaa3df185d65c33632e2d4b9 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 22 Jul 2018 12:58:09 +1000
Subject: [PATCH] update options

---
 files_panel.go | 18 +++++++++---------
 gui.go         |  5 ++++-
 merge_panel.go | 10 +++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/files_panel.go b/files_panel.go
index dd1f85525..ff30fe7f1 100644
--- a/files_panel.go
+++ b/files_panel.go
@@ -108,15 +108,15 @@ func handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 
 func renderfilesOptions(g *gocui.Gui, gitFile *GitFile) error {
 	optionsMap := map[string]string{
-		"tab":   "next panel",
-		"S":     "stash files",
-		"c":     "commit changes",
-		"o":     "open",
-		"s":     "open in sublime",
-		"v":     "open in vscode",
-		"i":     "ignore",
-		"d":     "delete",
-		"space": "toggle staged",
+		"← → ↑ ↓": "navigate",
+		"S":       "stash files",
+		"c":       "commit changes",
+		"o":       "open",
+		"s":       "sublime",
+		"v":       "vscode",
+		"i":       "ignore",
+		"d":       "delete",
+		"space":   "toggle staged",
 	}
 	if state.HasMergeConflicts {
 		optionsMap["a"] = "abort merge"
diff --git a/gui.go b/gui.go
index 12c05827d..19c0610fe 100644
--- a/gui.go
+++ b/gui.go
@@ -67,7 +67,10 @@ func handleRefresh(g *gocui.Gui, v *gocui.View) error {
 }
 
 func keybindings(g *gocui.Gui) error {
-	if err := g.SetKeybinding("", gocui.KeyTab, gocui.ModNone, nextView); err != nil {
+	if err := g.SetKeybinding("", gocui.KeyArrowRight, gocui.ModNone, nextView); err != nil {
+		return err
+	}
+	if err := g.SetKeybinding("", gocui.KeyArrowLeft, gocui.ModNone, previousView); err != nil {
 		return err
 	}
 	if err := g.SetKeybinding("", 'q', gocui.ModNone, quit); err != nil {
diff --git a/merge_panel.go b/merge_panel.go
index f0043ee94..7b595b393 100644
--- a/merge_panel.go
+++ b/merge_panel.go
@@ -236,11 +236,11 @@ func switchToMerging(g *gocui.Gui) error {
 
 func renderMergeOptions(g *gocui.Gui) error {
 	return renderOptionsMap(g, map[string]string{
-		"up/down":    "pick hunk",
-		"left/right": "previous/next commit",
-		"space":      "pick hunk",
-		"b":          "pick both hunks",
-		"z":          "undo",
+		"↑ ↓":   "select hunk",
+		"← →":   "navigate conflicts",
+		"space": "pick hunk",
+		"b":     "pick both hunks",
+		"z":     "undo",
 	})
 }