diff options
| author | David Chen <weichen2000121@gmail.com> | 2020-01-07 09:50:25 -0800 |
|---|---|---|
| committer | David Chen <weichen2000121@gmail.com> | 2020-01-07 09:50:25 -0800 |
| commit | 529ba45cc74c9f777c0589fa85b4a5f3ee109402 (patch) | |
| tree | 14dea64b3b3292f8093e4c184286564e9c8ee4c4 /pkg/gui/merge_panel.go | |
| parent | 66c7672a0cda3fa95b49d5bb2b6a0d25b4631794 (diff) | |
fixed keybinding display in merge_panel.go
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 64c17e6b4..2084ee4f1 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -5,6 +5,7 @@ package gui import ( "bufio" "bytes" + "fmt" "io/ioutil" "math" "os" @@ -243,6 +244,13 @@ func (gui *Gui) scrollToConflict(g *gocui.Gui) error { func (gui *Gui) renderMergeOptions() error { return gui.renderOptionsMap(map[string]string{ + fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("selectHunk"), + fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock")): gui.Tr.SLocalize("navigateConflicts"), + gui.getKeyDisplay("universal.select"): gui.Tr.SLocalize("pickHunk"), + gui.getKeyDisplay("main.pickBothHunks"): gui.Tr.SLocalize("pickBothHunks"), + gui.getKeyDisplay("main.undo"): gui.Tr.SLocalize("undo"), + }) + return gui.renderOptionsMap(map[string]string{ "↑ ↓": gui.Tr.SLocalize("selectHunk"), "← →": gui.Tr.SLocalize("navigateConflicts"), "space": gui.Tr.SLocalize("pickHunk"), |