diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-07 18:52:31 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-08 11:51:47 +1100 |
| commit | ff856b763033a241370bfde98d7386b43b7d0893 (patch) | |
| tree | 9818a3b50f815051a309882e6c48c482bfd7ef3a /pkg/gui/merge_panel.go | |
| parent | ca3afa2a3905365ec79624e0c9b08865e9ab27ae (diff) | |
fetching branches without checking out
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index e3da82f3c..2592275bf 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -194,9 +194,6 @@ func (gui *Gui) refreshMergePanel(g *gocui.Gui) error { gui.State.ConflictIndex = len(gui.State.Conflicts) - 1 } hasFocus := gui.currentViewName(g) == "main" - if hasFocus { - gui.renderMergeOptions(g) - } content, err := gui.coloredConflictFile(cat, gui.State.Conflicts, gui.State.ConflictIndex, gui.State.ConflictTop, hasFocus) if err != nil { return err @@ -233,8 +230,8 @@ func (gui *Gui) switchToMerging(g *gocui.Gui) error { return gui.refreshMergePanel(g) } -func (gui *Gui) renderMergeOptions(g *gocui.Gui) error { - return gui.renderOptionsMap(g, map[string]string{ +func (gui *Gui) renderMergeOptions() error { + return gui.renderOptionsMap(map[string]string{ "↑ ↓": gui.Tr.SLocalize("selectHunk"), "← →": gui.Tr.SLocalize("navigateConflicts"), "space": gui.Tr.SLocalize("pickHunk"), |