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

Conrad Irwin created 

Closes #ISSUE

Release Notes:

- N/A

Change summary

crates/worktree/src/worktree.rs | 3 +++
1 file changed, 3 insertions(+)

Detailed changes

crates/worktree/src/worktree.rs 🔗 

@@ -5472,6 +5472,9 @@ impl BackgroundScanner {
                         },
                         &(),
                     );
+                    if status.is_conflicted() {
+                        repository.current_merge_conflicts.insert(repo_path.clone());
+                    }
 
                     if let Some(path) = project_path {
                         changed_paths.push(path);