Danilo Leal 3c82ddf261 git_ui: Fix "resolve with agent" merge conflict notification (#51290) ... Follow up to https://github.com/zed-industries/zed/pull/49807 This PR fixes the merge conflict notification by making it appear only once per a given set of conflicted paths, as opposed to showing every time the `ConflictsUpdated` or `StatusesChanged` even would fire. Release Notes: - N/A		2026-03-11 11:35:59 -03:00
..
src	git_ui: Fix "resolve with agent" merge conflict notification (#51290)	2026-03-11 11:35:59 -03:00
Cargo.toml	Remove unreferenced dev dependencies (#51093)	2026-03-09 13:22:12 +01:00
LICENSE-GPL	Add placeholder git panel (#21894)	2024-12-11 22:13:52 -05:00