From 28f33d01035b622817663dc98d9a814fc40ff44e Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 11 Mar 2025 16:27:25 -0600
Subject: [PATCH] Fix conflict marker in project diff view (#26466)

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
---
 crates/multi_buffer/src/multi_buffer.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 1b1d691b53..78ad43b902 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2147,6 +2147,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,