diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 16:38:16 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 18:01:43 +1000 |
commit | 0822a9296c1e5f4c43b30b60d40ce870057f3494 (patch) | |
tree | aa50d3fdbd6cf384c222a4b0900bf3527c262a40 /pkg/gui/merge_panel.go | |
parent | d9fa02c53bb9b401f1b5ca07e8ed239862052a42 (diff) |
rename
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 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", |