Browse Source

Remove unused logger from RecursiveMerger

JGit doesn't currently use java.util.logging.Logger.  Remove this
never-used Logger introduced in ab99b78ca0 (Implement recursive
merge strategy, 2013-02-21) to make that easier to see.

Change-Id: I92c578e7f3617085a667de7c992174057be3eb71
stable-3.0
Jonathan Nieder 12 years ago
parent
commit
31d79ae0af
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java

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

@ -53,7 +53,6 @@ import java.io.IOException;
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 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator;
* @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

Loading…
Cancel
Save