# Refine styling of merge conflicts \(\#31012\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 0b7583bae56f0a4f5e492719f0001441500d0459

Requested commit: 0b7583bae56f0a4f5e492719f0001441500d0459

Commit: 0b7583bae56f0a4f5e492719f0001441500d0459

Tree: 9620a3cecd4138ab51556e7f6cd15733688e06bb

Author: Nate Butler

Committer: GitHub

## Message

```
Refine styling of merge conflicts (#31012)

- Improved colors
- Blank out diff hunk gutter highlights in conflict regions
- Paint conflict marker highlights all the way to the gutter

Release Notes:

- Improved the highlighting of merge conflict markers in editors.

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Cole Miller <cole@zed.dev>
```

## Parents

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

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