Revert "ResolveMerge only needs to visit differing TreeEntries"

This reverts commit bda5e764200dafb2311149a9152c02373127287d. This reduces
performance at least for non-bare repositories.

Change-Id: Ib26cf8372f210798e104112edf14e91bfeaf23ec

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 98c8342de0258a59b8e50d283d1c3f3583d90026..953d3a2cd2bc3112c7ae34ea5a2112bff2dde070 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -90,7 +90,6 @@ import org.eclipse.jgit.treewalk.CanonicalTreeParser;
 import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.WorkingTreeIterator;
-import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.TemporaryBuffer;
 
@@ -1009,7 +1008,6 @@ public class ResolveMerger extends ThreeWayMerger {
                DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
 
                tw = new NameConflictTreeWalk(reader);
-               tw.setFilter(TreeFilter.ANY_DIFF);
                tw.addTree(baseTree);
                tw.addTree(headTree);
                tw.addTree(mergeTree);