diff options
| author | Cristian Betivu <cbe@languagewire.com> | 2021-06-02 19:53:01 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-06-05 13:53:25 +1000 |
| commit | 05a23f0e1e6531e50beccc661b307fd6643d4431 (patch) | |
| tree | f920315e55e50034bf22f0f8da8eb157cfc41e37 | |
| parent | fd38ad809606bda7dfb820a0c2a56e2aaa0f87bd (diff) | |
Discard value after END marker
| -rw-r--r-- | pkg/gui/mergeconflicts/find_conflicts.go | 2 |
1 files changed, 2 insertions, 0 deletions
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 } |