diff options
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 01f91d3cb..77b36be8a 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -80,7 +80,7 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { prompt: gui.Tr.FoundConflicts, handlersManageFocus: true, handleConfirm: func() error { - return gui.pushContext(gui.Contexts.Files.Context) + return gui.pushContext(gui.Contexts.Files) }, handleClose: func() error { if err := gui.returnFromContext(); err != nil { |