Cole Miller 724c935196 Highlight merge conflicts and provide for resolving them (#28065) ... TODO: - [x] Make it work in the project diff: - [x] Support non-singleton buffers - [x] Adjust excerpt boundaries to show full conflicts - [x] Write tests for conflict-related events and state management - [x] Prevent hunk buttons from appearing inside conflicts - [x] Make sure it works over SSH, collab - [x] Allow separate theming of markers Bonus: - [ ] Count of conflicts in toolbar - [ ] Keyboard-driven navigation and resolution - [ ] ~~Inlay hints to contextualize "ours"/"theirs"~~ Release Notes: - Implemented initial support for resolving merge conflicts. --------- Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>		2025-04-23 12:38:46 -04:00
..
src	Highlight merge conflicts and provide for resolving them (#28065)	2025-04-23 12:38:46 -04:00
Cargo.toml	Use new multibuffer excerpts in project search (#27893)	2025-04-02 22:57:40 +00:00
LICENSE-GPL	chore: Change AGPL-licensed crates to GPL (except for collab) (#4231)	2024-01-24 00:26:58 +01:00