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
..
askpass_modal.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00
blame_ui.rs	editor: Move blame popover from hover_tooltip to editor prepaint (#29320)	2025-04-25 01:52:24 +05:30
branch_picker.rs	git_ui: Replace spaces with hyphens in new branch names (#27873)	2025-05-27 17:10:20 +00:00
commit_message_prompt.txt	git_ui: Try to prompt the model out of including the diff output (#26281)	2025-03-07 15:05:35 +00:00
commit_modal.rs	Improve handling of remote-tracking branches in the picker (#29744)	2025-05-01 21:24:26 -04:00
commit_tooltip.rs	editor: Move blame popover from hover_tooltip to editor prepaint (#29320)	2025-04-25 01:52:24 +05:30
commit_view.rs	Use anyhow more idiomatically (#31052)	2025-05-20 23:06:07 +00:00
conflict_view.rs	Refine styling of merge conflicts (#31012)	2025-06-09 19:03:19 +00:00
git_panel.rs	git_ui: Improve error handling in commit message generation (#29005)	2025-06-09 14:20:19 +00:00
git_panel_settings.rs	Git tweaks (#28791)	2025-04-28 23:42:23 -06:00
git_ui.rs	git: Add PushTo to select which remote to push (#31482)	2025-06-06 21:07:40 +00:00
onboarding.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00
picker_prompt.rs	git: Pick which remote to fetch (#26897)	2025-06-06 11:28:07 -04:00
project_diff.rs	Automatically keep edits if they are included in a commit (#32093)	2025-06-04 19:54:24 +02:00
remote_output.rs	git: Pick which remote to fetch (#26897)	2025-06-06 11:28:07 -04:00
repository_selector.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00