Skip to content

three-way diff highlighting is confusing #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
SadSock opened this issue Apr 30, 2025 · 0 comments
Open

three-way diff highlighting is confusing #573

SadSock opened this issue Apr 30, 2025 · 0 comments

Comments

@SadSock
Copy link

SadSock commented Apr 30, 2025

The current three-way merge diff highlighting (base, ours, theirs) is visually confusing. ​​All differences are highlighted across all panes​​, making it difficult to focus on relevant changes.

Image

Has a method to restrict ​​ours/theirs​​ panes to show diffs ​​only against base​​, not against each other.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@SadSock