summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers/working_tree_helper.go
diff options
context:
space:
mode:
authorMoritz Haase <Moritz.Haase@bmw.de>2022-03-30 08:48:29 +0200
committerJesse Duffield <jessedduffield@gmail.com>2022-03-30 20:13:43 +1100
commit8fb2acc2244ae0364fa20288bfcf70deed3ae974 (patch)
tree02c132565c7b87bf54f895fbc0d815efce867cd1 /pkg/gui/controllers/helpers/working_tree_helper.go
parentf2fb6453a13d7e609bb8456843e208e8e3e7901a (diff)
pkg/gui: Rename IPopupHandler::Ask() to Confirm()
Follow the JavaScript naming scheme for user interaction (alert, prompt, confirm) as discussed in #1832.
Diffstat (limited to 'pkg/gui/controllers/helpers/working_tree_helper.go')
-rw-r--r--pkg/gui/controllers/helpers/working_tree_helper.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go
index 3d79ebbc1..ab52a37c7 100644
--- a/pkg/gui/controllers/helpers/working_tree_helper.go
+++ b/pkg/gui/controllers/helpers/working_tree_helper.go
@@ -61,7 +61,7 @@ func (self *WorkingTreeHelper) FileForSubmodule(submodule *models.SubmoduleConfi
}
func (self *WorkingTreeHelper) OpenMergeTool() error {
- return self.c.Ask(types.AskOpts{
+ return self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.MergeToolTitle,
Prompt: self.c.Tr.MergeToolPrompt,
HandleConfirm: func() error {