mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
Remove calls to Error()
Now that we have an error handler set, we can simply let them bubble up all the way to gocui.
This commit is contained in:
@ -129,7 +129,7 @@ func (self *MergeConflictsHelper) RefreshMergeState() error {
|
||||
|
||||
hasConflicts, err := self.SetConflictsAndRender(self.c.Contexts().MergeConflicts.GetState().GetPath())
|
||||
if err != nil {
|
||||
return self.c.Error(err)
|
||||
return err
|
||||
}
|
||||
|
||||
if !hasConflicts {
|
||||
|
Reference in New Issue
Block a user