From 73548fa15fe6f65b6a4c35c03402865145c0e107 Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Sun, 22 Aug 2021 01:03:15 +0900 Subject: [PATCH] Fix conflict resolution --- pkg/gui/mergeconflicts/state.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/gui/mergeconflicts/state.go b/pkg/gui/mergeconflicts/state.go index 343f282ad..1eea08cb0 100644 --- a/pkg/gui/mergeconflicts/state.go +++ b/pkg/gui/mergeconflicts/state.go @@ -156,11 +156,9 @@ func (s *State) ContentAfterConflictResolve(path string, selection Selection) (b } func isIndexToDelete(i int, conflict *mergeConflict, selection Selection) bool { - isMarkerLine := - i == conflict.start || - i == conflict.ancestor || - i == conflict.target || - i == conflict.end + if i < conflict.start || conflict.end < i { + return false + } var isWantedContent bool switch selection { @@ -175,5 +173,6 @@ func isIndexToDelete(i int, conflict *mergeConflict, selection Selection) bool { case BOTTOM: isWantedContent = conflict.target < i && i < conflict.end } - return isMarkerLine || !isWantedContent + + return !isWantedContent }