git: Side-by-side diff UX improvements#48821
Merged
cameron1024 merged 5 commits intomainfrom Feb 9, 2026
Merged
Conversation
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Cole Miller <cole@zed.dev>
naaiyy
added a commit
to Glass-HQ/Glass
that referenced
this pull request
Feb 16, 2026
Key changes: - Side-by-side diff UX improvements (zed-industries#48821) - major diff view polish - Display map refactoring - large cleanup of display_map.rs (~1000 line reduction) - Split editor growth (zed-industries#48753) - significant expansion of split.rs - Multi-char folds fix (zed-industries#48721) - New multi workspace (zed-industries#47795, then reverted zed-industries#48776) - Default view mode setting for SplittableEditor (zed-industries#48440) - macOS drag-drop fix: reset external_files_dragged (zed-industries#48727) - Windows: OS caption/buttons for custom titlebar (zed-industries#48330) - Windows timer resolution guard (zed-industries#48379) - Bedrock Claude Opus 4.6 model (zed-industries#48525) - MCP servers: fix disabled servers disappearing after restart (zed-industries#47758) - Shell command parser extracted to shared crate (zed-industries#48660) - Format-on-save for streaming edit file tool (zed-industries#48663) - Agent: insert images at cursor position (zed-industries#48779) - Project panel: improved file/folder creation in folded paths (zed-industries#46750) - Folding ranges panic fix (zed-industries#48809) - REPL: shutdown all kernels on app quit (zed-industries#48760) - Extension CI improvements - Security updates: time v0.3.47, git2 v0.20.4 Conflict resolution: - collab (Cargo.toml, extensions API, db, tests): deleted - GPUI (8 files): deleted from Glass (handled in Obsydian-HQ/gpui) - Cargo.lock: took upstream Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ToggleDiffViewactionRelease Notes: