diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 12:20:49 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 94601b4dc951de9b1efa08120148d2d9766b637c (patch) | |
| tree | 0541d8468d78a58f4a2ef069323de475be13d29c /pkg/gui/merge_panel.go | |
| parent | 9ca0073cd7680d2417d4bb0a38a7b02df3dfd651 (diff) | |
use context to return to the correct view
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index da54b01ed..aa4dbe00d 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -341,10 +341,8 @@ func (gui *Gui) promptToContinue() error { gui.takeOverScrolling() return gui.ask(askOpts{ - returnToView: gui.getFilesView(), - returnFocusOnClose: true, - title: "continue", - prompt: gui.Tr.SLocalize("ConflictsResolved"), + title: "continue", + prompt: gui.Tr.SLocalize("ConflictsResolved"), handleConfirm: func() error { return gui.genericMergeCommand("continue") }, |