Cole MillerandBennet Bo Fenner 18674760c7 git: Fix conflicted paths not getting cleared (#50327) ...

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a bug where files would still be marked as having git conflicts
after resolving them.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>

2026-03-02 13:40:34 +00:00

..

src

git: Fix conflicted paths not getting cleared (#50327)

2026-03-02 13:40:34 +00:00

Cargo.toml

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

LICENSE-APACHE

chore: Add crate licenses. (#4158)

2024-01-23 16:56:22 +01:00