diff options
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 37ad6725a..ba204e41d 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -270,7 +270,7 @@ func (gui *Gui) handleEscapeMerge() error { // it's possible this method won't be called from the merging view so we need to // ensure we only 'return' focus if we already have it if gui.g.CurrentView() == gui.getMainView() { - return gui.pushContext(gui.Contexts.Files.Context) + return gui.pushContext(gui.Contexts.Files) } return nil } @@ -303,14 +303,14 @@ func (gui *Gui) promptToContinueRebase() error { prompt: gui.Tr.ConflictsResolved, handlersManageFocus: true, handleConfirm: func() error { - if err := gui.pushContext(gui.Contexts.Files.Context); err != nil { + if err := gui.pushContext(gui.Contexts.Files); err != nil { return err } return gui.genericMergeCommand("continue") }, handleClose: func() error { - return gui.pushContext(gui.Contexts.Files.Context) + return gui.pushContext(gui.Contexts.Files) }, }) } |