Skip to content

Automatically switch to unified diffs when diff view is narrower than a configurable "minimum split diff width"#52781

Merged
maxbrunsfeld merged 6 commits intomainfrom
store-diff-mode
Mar 31, 2026
Merged

Automatically switch to unified diffs when diff view is narrower than a configurable "minimum split diff width"#52781
maxbrunsfeld merged 6 commits intomainfrom
store-diff-mode

Conversation

@maxbrunsfeld
Copy link
Copy Markdown
Collaborator

@maxbrunsfeld maxbrunsfeld commented Mar 30, 2026

Release Notes:

  • The git diff diff view now automatically switches from split mode to unified mode when the pane is narrower than a configurable minimum column count. You can configure this via the new minimum_split_diff_width setting.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Mar 30, 2026
@zed-codeowner-coordinator zed-codeowner-coordinator bot requested review from a team March 30, 2026 23:31
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Mar 30, 2026
@zed-codeowner-coordinator zed-codeowner-coordinator bot requested review from as-cii, cole-miller and smitbarmase and removed request for a team March 30, 2026 23:31
@maxbrunsfeld maxbrunsfeld merged commit fb87786 into main Mar 31, 2026
30 checks passed
@maxbrunsfeld maxbrunsfeld deleted the store-diff-mode branch March 31, 2026 01:47
Copy link
Copy Markdown
Member

@cole-miller cole-miller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@cole-miller
Copy link
Copy Markdown
Member

cole-miller commented Apr 1, 2026

@zed-zippy approved

danilo-leal added a commit that referenced this pull request Apr 2, 2026
Follow-up to #52781, adding
some different icons to better express the state in which the split diff
_is selected_ but _isn't active_, which happens when the editor is
smaller than a given amount of defined columns.


https://github.com/user-attachments/assets/2e7aaf6c-077f-4be5-9439-ce6c2050e63d

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants