Discard value after END marker

jesseduffield · Jun 5, 2021 · 05a23f0 · 05a23f0
1 parent fd38ad8
commit 05a23f0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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
 		}