Fix conflict marker in project diff view (#26466)
Closes #ISSUE Release Notes: - N/A Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
co-authored by
Max Brunsfeld
parent
55a90f576a
commit
28f33d0103
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user