Fix conflict marker in project diff view (cherry-pick #26466) (#26492)

gcp-cherry-pick-bot[bot] , Conrad Irwin , and Max Brunsfeld created 10 months ago

Cherry-picked Fix conflict marker in project diff view (#26466)

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <[e-mail]>

Co-authored-by: Conrad Irwin <[e-mail]>
Co-authored-by: Max Brunsfeld <[e-mail]>

Change summary

crates/multi_buffer/src/multi_buffer.rs | 1 +
1 file changed, 1 insertion(+)

Detailed changes

crates/multi_buffer/src/multi_buffer.rs

@@ -2142,6 +2142,7 @@ impl MultiBuffer {
         }
 
         self.sync_diff_transforms(&mut snapshot, edits, DiffChangeKind::BufferEdited);
+        self.buffer_changed_since_sync.replace(true);
         cx.emit(Event::Edited {
             singleton_buffer_edited: false,
             edited_buffer: None,