motiejus
/
jgit
1
Fork 0
Code Releases Activity

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

This commit is contained in:
Matthias Sohn 2015-05-04 09:33:27 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 4f9bdc8b84 510aed1493
commit c2ce3a60e0
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -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);