# Split conflicts into their own section \(\#24324\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 0a70627f005a1b070dbe495ffd9ea0e4a3817da1

Requested commit: 0a70627f005a1b070dbe495ffd9ea0e4a3817da1

Commit: 0a70627f005a1b070dbe495ffd9ea0e4a3817da1

Tree: 8aa5487ad0c12088dd599cf94feeaeff0d99efe0

Author: Conrad Irwin

Committer: GitHub

## Message

```
Split conflicts into their own section (#24324)

Co-Authored-By: Mikayla <mikayla@zed.dev>

Release Notes:

- N/A
```

## Parents

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

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