Merge "Revert "ResolveMerge only needs to visit differing TreeEntries""
This commit is contained in:
commit
c2ce3a60e0
|
@ -90,7 +90,6 @@
|
||||||
import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
|
import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
|
||||||
import org.eclipse.jgit.treewalk.TreeWalk;
|
import org.eclipse.jgit.treewalk.TreeWalk;
|
||||||
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
|
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
|
||||||
import org.eclipse.jgit.treewalk.filter.TreeFilter;
|
|
||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.TemporaryBuffer;
|
import org.eclipse.jgit.util.TemporaryBuffer;
|
||||||
|
|
||||||
|
@ -1009,7 +1008,6 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree,
|
||||||
DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
|
DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
|
||||||
|
|
||||||
tw = new NameConflictTreeWalk(reader);
|
tw = new NameConflictTreeWalk(reader);
|
||||||
tw.setFilter(TreeFilter.ANY_DIFF);
|
|
||||||
tw.addTree(baseTree);
|
tw.addTree(baseTree);
|
||||||
tw.addTree(headTree);
|
tw.addTree(headTree);
|
||||||
tw.addTree(mergeTree);
|
tw.addTree(mergeTree);
|
||||||
|
|
Loading…
Reference in New Issue