From 3c90d5972a8bcff9d2c10d3262c4ea47999679e3 Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Fri, 9 Dec 2005 16:56:16 +0000
Subject: Bug 120052 Create an IResourceDiffTree

---
 .../eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java')

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
index 08545498e..d6f1fb1fc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
@@ -49,7 +49,7 @@ public class DefaultResourceMappingMerger implements IResourceMappingMerger {
 		for (int i = 0; i < mappings.length; i++) {
 			ResourceMapping mapping = mappings[i];
 			ResourceTraversal[] traversals = mergeContext.getScope().getTraversals(mapping);
-			IDiffNode[] deltas = mergeContext.getDiffs(traversals);
+			IDiffNode[] deltas = mergeContext.getDiffTree().getDiffs(traversals);
 			for (int j = 0; j < deltas.length; j++) {
 				IDiffNode delta = deltas[j];
 				result.add(delta);
-- 
cgit v1.2.3