Compare commits

...

1 Commits

Author SHA1 Message Date
Conrad Irwin
c48382d1a2 Fix panic in git conflict parsing 2025-06-04 16:59:58 -06:00

View File

@@ -212,7 +212,7 @@ impl ConflictSet {
&& theirs_start.is_some()
{
let theirs_end = line_pos;
let conflict_end = line_end + 1;
let conflict_end = (line_end + 1).min(buffer.len());
let range = buffer.anchor_after(conflict_start.unwrap())
..buffer.anchor_before(conflict_end);