From 05a23f0e1e6531e50beccc661b307fd6643d4431 Mon Sep 17 00:00:00 2001 From: Cristian Betivu Date: Wed, 2 Jun 2021 19:53:01 +0200 Subject: [PATCH] Discard value after END marker --- pkg/gui/mergeconflicts/find_conflicts.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/gui/mergeconflicts/find_conflicts.go b/pkg/gui/mergeconflicts/find_conflicts.go index 661cc5cc0..2138215f1 100644 --- a/pkg/gui/mergeconflicts/find_conflicts.go +++ b/pkg/gui/mergeconflicts/find_conflicts.go @@ -35,6 +35,8 @@ func findConflicts(content string) []*mergeConflict { case END: newConflict.end = i conflicts = append(conflicts, newConflict) + // reset value to avoid any possible silent mutations in further iterations + newConflict = nil default: // line isn't a merge conflict marker so we just continue }