summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/merge_panel.go')
-rw-r--r--pkg/gui/merge_panel.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go
index 5918b9476..c40daab65 100644
--- a/pkg/gui/merge_panel.go
+++ b/pkg/gui/merge_panel.go
@@ -336,7 +336,7 @@ func (gui *Gui) handleCompleteMerge() error {
func (gui *Gui) promptToContinue() error {
gui.takeOverScrolling()
- return gui.createConfirmationPanel(createConfirmationPanelOpts{
+ return gui.ask(askOpts{
returnToView: gui.getFilesView(),
returnFocusOnClose: true,
title: "continue",