diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-30 20:03:08 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 0a8cff6ab68dc92b98136c4ebe5c6bc7f8f1b3c7 (patch) | |
| tree | a68b6ffa7a886d73346f6305c76db0ffe54cbe7b /pkg/gui/commit_files_panel.go | |
| parent | e2f5fe101621c0162791d6ea312ef8093616f59c (diff) | |
some more refactoring
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index e4932d080..8e6410b9e 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -83,7 +83,7 @@ func (gui *Gui) handleDiscardOldFileChange() error { return gui.c.WithWaitingStatus(gui.c.Tr.RebasingStatus, func() error { gui.c.LogAction(gui.c.Tr.Actions.DiscardOldFileChange) if err := gui.git.Rebase.DiscardOldFileChanges(gui.State.Commits, gui.State.Panels.Commits.SelectedLineIdx, fileName); err != nil { - if err := gui.checkMergeOrRebase(err); err != nil { + if err := gui.helpers.rebase.CheckMergeOrRebase(err); err != nil { return err } } |