go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

Address feedback

Browse Source
This commit is contained in:
Jesse Duffield 2021-08-25 21:51:43 +10:00
parent f08fdb2873
commit 44d08edfb0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/mergeconflicts/merge_conflict.go
View File

@ -42,8 +42,7 @@ func (s Selection) isIndexToKeep(conflict *mergeConflict, i int) bool {
return false
}
selectionStart, selectionEnd := s.bounds(conflict)
return selectionStart < i && i < selectionEnd
return s.selected(conflict, i)
}
func (s Selection) bounds(c *mergeConflict) (int, int) {