diff options
| author | David Chen <weichen2000121@gmail.com> | 2020-01-07 12:48:11 -0800 |
|---|---|---|
| committer | David Chen <weichen2000121@gmail.com> | 2020-01-07 12:48:11 -0800 |
| commit | de2cfc7e176c210c593e654d2aa857624507a9a0 (patch) | |
| tree | 58dc97c84a4cdd4cfe4e04d5e39b2eeccb44bbcd | |
| parent | e72cab81c1326eddd1d391e509dd66c06b03e57e (diff) | |
cleanup
| -rw-r--r-- | pkg/gui/merge_panel.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 2084ee4f1..25238ce4f 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -250,13 +250,6 @@ func (gui *Gui) renderMergeOptions() error { 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"), - "b": gui.Tr.SLocalize("pickBothHunks"), - "z": gui.Tr.SLocalize("undo"), - }) } func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error { |