mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 23:20:18 +01:00
3c82ddf261
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