Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix conflict marker in project diff view (#26466)

Browse source 
Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Conrad Irwin 2025-03-11 16:27:25 -06:00 • committed by GitHub
parent 55a90f576a
commit 28f33d0103
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/multi_buffer/src/multi_buffer.rs
View file

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