diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 10:50:27 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | fda9f4ea7a476a11d4a50cbbd9ce657fe69ae2cb (patch) | |
| tree | 499299faa4d6a6d59f9b10ad989448d52dddcd28 /pkg/gui/merge_panel.go | |
| parent | f876d8fdc82235f75a11a5807f05b4d8b469d521 (diff) | |
centralise logic for rendering options map
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index c23549d39..da54b01ed 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -292,14 +292,14 @@ func (gui *Gui) scrollToConflict(g *gocui.Gui) error { return nil } -func (gui *Gui) renderMergeOptions() error { - return gui.renderOptionsMap(map[string]string{ +func (gui *Gui) getMergingOptions() map[string]string { + return 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("universal.undo"): gui.Tr.SLocalize("undo"), - }) + } } func (gui *Gui) handleEscapeMerge() error { |