commit c2ce3a60e0130b10584896a04d1bf7f32ac8302e
author Matthias Sohn <matthias.sohn@sap.com> Mon May 04 09:33:27 2015 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon May 04 09:33:30 2015 -0400
tree a1add134ed861ac20dbdd073a7c2c2ad9c85bec8
parent 4f9bdc8b8478480ffceb652aab331a3a4fa99c71
parent 510aed1493df6d767152c3f35f3878bbeb524495

Merge "Revert "ResolveMerge only needs to visit differing TreeEntries""

org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

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 98c8342..953d3a2 100644
--- 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.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 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree,
 		DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
 
 		tw = new NameConflictTreeWalk(reader);
-		tw.setFilter(TreeFilter.ANY_DIFF);
 		tw.addTree(baseTree);
 		tw.addTree(headTree);
 		tw.addTree(mergeTree);