sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-09 09:22:48 +03:00
Code Activity

feat(merge_panel): Add open/edit files in merge conflict panel

Browse Source
This commit is contained in:
Ryooooooga
2022-04-04 21:12:33 +09:00
committed by Jesse Duffield
parent 53257db99d
commit 3b5a019e1a
7 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/gui/mergeconflicts/state.go
View File

@@ -182,3 +182,13 @@ func (s *State) ContentAfterConflictResolve(selection Selection) (bool, string,
return true, content, nil
}
func (s *State) GetSelectedLine() int {
conflict := s.currentConflict()
if conflict == nil {
return 1
}
selection := s.Selection()
startIndex, _ := selection.bounds(conflict)
return startIndex + 1
}