motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Remove unused logger from RecursiveMerger"

This commit is contained in:
Robin Rosenberg 2013-04-27 08:55:32 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 664d738c9f 31d79ae0af
commit a5e78a3f06
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
View File

@ -53,7 +53,6 @@
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.dircache.DirCacheBuilder;
@ -85,8 +84,6 @@
* @since 3.0 * @since 3.0
*/ */
public class RecursiveMerger extends ResolveMerger { public class RecursiveMerger extends ResolveMerger {
static Logger log = Logger.getLogger(RecursiveMerger.class.toString());
/** /**
* The maximum number of merge bases. This merge will stop when the number * The maximum number of merge bases. This merge will stop when the number
* of merge bases exceeds this value * of merge bases exceeds this value