Nate Butler 0b7583bae5 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>

2025-06-09 19:03:19 +00:00

..

fonts

Fix font selection on macOS (#13615)

2024-06-27 17:02:45 -06:00

icons

agent: Allow to accept and reject all via the panel (#31971)

2025-06-03 15:20:25 -03:00

images

Add Zed Pro Trial Upsell (#29938)

2025-05-05 18:46:54 -04:00

keymaps

Cleanup comments in linux keymaps (#32333)

2025-06-08 09:02:52 +00:00

prompts

assistant: Partial fix for HTML entities in tools params (#32148)

2025-06-05 10:36:55 +00:00

settings

project_panel: Add hide_root when only one folder in the project (#25289)

2025-06-09 16:46:31 +05:30

sounds

agent: Add sound notification when done generating (#31472)

2025-05-26 21:20:41 -03:00

themes

Refine styling of merge conflicts (#31012)

2025-06-09 19:03:19 +00:00