Conrad Irwin 6516249302 Fix conflict state (was broken by merge conflict) (#25354) ...

Closes #ISSUE

Release Notes:

- N/A

2025-02-24 10:52:42 -07:00

..

ignore.rs

Fix Linux search issues (#13479)

2024-06-24 13:46:21 -07:00

worktree_settings.rs

Eliminate GPUI View, ViewContext, and WindowContext types (#22632)

2025-01-26 03:02:45 +00:00

worktree_tests.rs

cx.background_executor().spawn(...) -> cx.background_spawn(...) (#25103)

2025-02-18 20:30:33 +00:00

worktree.rs

Fix conflict state (was broken by merge conflict) (#25354)

2025-02-24 10:52:42 -07:00