From 75fe8ea46c6aa0a0c4725c647555541ea72cda88 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 1 Jul 2026 19:04:19 +0200 Subject: [PATCH] Show unified diff for compare inputs that carry an ancestor canShowInUnifiedDiff rejected any ICompareInput with a common ancestor, which excluded EGit history compares (e.g. Compare With Previous Version) that attach a git merge-base ancestor. The overlay only renders left vs right, so the ancestor can be ignored. --- .../org/eclipse/compare/internal/CompareUIPlugin.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index 0b4b2cc41f5..f380ca3d85f 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -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;