diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-16 13:58:29 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 7f89113245307be8a1642105014e9ce51a47210f (patch) | |
| tree | 0b1237c4bdd4a465bedb7cc49c8372d0bfc46ea5 /pkg/gui/merge_panel.go | |
| parent | 0ea0c486310558e26af7ad6e4fcf17f57c2b62e3 (diff) | |
WIP
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index f7c1984b2..bbb58c5ff 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -308,7 +308,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.switchFocus(gui.getMainView(), gui.getFilesView()) + return gui.switchContext(gui.Contexts.Files.Context) } return nil } |