Skip to content

Show unified diff for compare inputs that carry an ancestor #2789

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

Merged
vogella merged 1 commit into from
Jul 1, 2026
Merged

Show unified diff for compare inputs that carry an ancestor #2789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,8 @@ private LeftEditorInputAndRightStreamContentAccessor canShowInUnifiedDiff(Compar
if (!(res instanceof ICompareInput compareInput)) {
return null;
}
ITypedElement ancestor = compareInput.getAncestor();
if (ancestor != null) {
return null;
}
// A common ancestor (3-way input) is ignored; the unified diff renders a
// plain left-vs-right overlay.
ITypedElement left = compareInput.getLeft();
if (left == null) {
return null;
Expand Down
Loading