diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 15:19:43 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | 1a38bfb76d5e2f1b0f03c35fc17f463b0ecf54f1 (patch) | |
| tree | dfe8aa7ccad7566e2a51a376b0105bb490115fe2 /pkg/gui/rebase_options_panel.go | |
| parent | beaebb7dc7576d69c43e6b1f3aabc83ff312b3fe (diff) | |
do not return focus to commitsFiles view after selecting to start a new patch
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 41f0070c3..bc3dd13f0 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -80,7 +80,7 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { } else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") { return gui.genericMergeCommand("continue") } else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") { - return gui.createConfirmationPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"), + return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"), func(g *gocui.Gui, v *gocui.View) error { return nil }, func(g *gocui.Gui, v *gocui.View) error { |