diff options
Diffstat (limited to 'pkg/gui/controllers/helpers/merge_conflicts_helper.go')
| -rw-r--r-- | pkg/gui/controllers/helpers/merge_conflicts_helper.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/merge_conflicts_helper.go b/pkg/gui/controllers/helpers/merge_conflicts_helper.go index 31f7bd5e3..249be4b69 100644 --- a/pkg/gui/controllers/helpers/merge_conflicts_helper.go +++ b/pkg/gui/controllers/helpers/merge_conflicts_helper.go @@ -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 { |