go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-06-20 01:19:23 +02:00
Code Issues Releases Activity

Address feedback

Browse Source
This commit is contained in:
Jesse Duffield
2021-08-25 22:23:55 +10:00
parent f08fdb2873
commit 44d08edfb0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/gui/mergeconflicts/merge_conflict.go
+1 -2
View File
@@ -42,8 +42,7 @@ func (s Selection) isIndexToKeep(conflict *mergeConflict, i int) bool {
return false return false
} }
selectionStart, selectionEnd := s.bounds(conflict) return s.selected(conflict, i)
return selectionStart < i && i < selectionEnd
} }
func (s Selection) bounds(c *mergeConflict) (int, int) { func (s Selection) bounds(c *mergeConflict) (int, int) {