diff options
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 05bc44bb3..5de1a7e3c 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -40,7 +40,7 @@ func (gui *Gui) genericMergeCommand(command string) error { status := gui.workingTreeState() if status != "merging" && status != "rebasing" { - return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotMergingOrRebasing")) + return gui.createErrorPanel(gui.Tr.SLocalize("NotMergingOrRebasing")) } commandType := strings.Replace(status, "ing", "e", 1) @@ -83,6 +83,6 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { }, ) } else { - return gui.createErrorPanel(gui.g, result.Error()) + return gui.createErrorPanel(result.Error()) } } |