# Fix a panic in merge conflict parsing \(\#32119\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/9c7b1d19ce06664486dad6ebd7c3990f98491613)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 9c7b1d19ce06664486dad6ebd7c3990f98491613

Requested commit: 9c7b1d19ce06664486dad6ebd7c3990f98491613

Commit: 9c7b1d19ce06664486dad6ebd7c3990f98491613

Tree: 62b67cb357c599c098172f06ee4d20d179c84fa3

Author: Cole Miller

Committer: GitHub

## Message

```
Fix a panic in merge conflict parsing (#32119)

Release Notes:

- Fixed a panic that could occur when editing files containing merge
conflicts.
```

## Parents

- [3d9881121fc10bf97736b4d741c44e29ae6f2e9e](https://git.cafe/gitcafe/zed/commit/3d9881121fc10bf97736b4d741c44e29ae6f2e9e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/9c7b1d19ce06664486dad6ebd7c3990f98491613?format=markdown)