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
..
src	Refine styling of merge conflicts (#31012)	2025-06-09 19:03:19 +00:00
Cargo.toml	agent: Add tests for thread serialization code (#32383)	2025-06-09 12:20:19 +00:00
LICENSE-GPL	Rename assistant2 to agent (#27887)	2025-04-02 00:40:47 +00:00