diff options
Diffstat (limited to 'pkg/gui/controllers/merge_conflicts_controller.go')
| -rw-r--r-- | pkg/gui/controllers/merge_conflicts_controller.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index 7cfcfa62d..de282d4c9 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -166,8 +166,7 @@ func (self *MergeConflictsController) HandleEditFile() error { } func (self *MergeConflictsController) HandleOpenFile() error { - lineNumber := self.context().GetState().GetSelectedLine() - return self.helpers.Files.OpenFileAtLine(self.context().GetState().GetPath(), lineNumber) + return self.helpers.Files.OpenFile(self.context().GetState().GetPath()) } func (self *MergeConflictsController) HandleScrollLeft() error { |