diff --git a/pkg/gui/mergeconflicts/merge_conflict.go b/pkg/gui/mergeconflicts/merge_conflict.go index 8fb5e0fe3..e6b617f57 100644 --- a/pkg/gui/mergeconflicts/merge_conflict.go +++ b/pkg/gui/mergeconflicts/merge_conflict.go @@ -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) {