From 70247843db3307c947ef36b83c7815be10d034f8 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 16:14:19 -0700 Subject: [PATCH] Fix conflict marker in project diff view (cherry-pick #26466) (#26492) Cherry-picked Fix conflict marker in project diff view (#26466) Closes #ISSUE Release Notes: - N/A Co-authored-by: Max Brunsfeld Co-authored-by: Conrad Irwin Co-authored-by: Max Brunsfeld --- 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 dfae115d8fdc0c6dc9c7847c888262c7eb5733e8..f3d4e718bc18b24a900d0799659a8328b17aa3e9 100644 --- a/crates/multi_buffer/src/multi_buffer.rs +++ b/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,