diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 13:14:48 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-11-28 20:48:17 +1100 |
commit | da3b0bf7c8aa6202d5eb9c8178f6648bc695336a (patch) | |
tree | cd0666ae4253469f8f2f1e349357be37bfb3d571 /pkg/gui/merge_panel.go | |
parent | 90ade3225f55652d40c6f0266e50f5328390f02b (diff) |
Start on supporting auto-suggestions when checking out a branch
switch to other fuzzy package with no dependencies
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 85e7198e5..60ce4d560 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -309,7 +309,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.switchContext(gui.Contexts.Files.Context) + return gui.pushContext(gui.Contexts.Files.Context) } return nil } @@ -342,14 +342,14 @@ func (gui *Gui) promptToContinue() error { prompt: gui.Tr.ConflictsResolved, handlersManageFocus: true, handleConfirm: func() error { - if err := gui.switchContext(gui.Contexts.Files.Context); err != nil { + if err := gui.pushContext(gui.Contexts.Files.Context); err != nil { return err } return gui.genericMergeCommand("continue") }, handleClose: func() error { - return gui.switchContext(gui.Contexts.Files.Context) + return gui.pushContext(gui.Contexts.Files.Context) }, }) } |