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	Add workspace-hack (#27277)	2025-04-02 13:26:34 -07:00
LICENSE-GPL	chore: Change AGPL-licensed crates to GPL (except for collab) (#4231)	2024-01-24 00:26:58 +01:00