github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge "Remove unused logger from RecursiveMerger"

stable-3.0
Robin Rosenberg 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
664d738c9f 31d79ae0af
commit
a5e78a3f06
1 changed files with 0 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java

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

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

Write Preview
Loading…
Cancel
Save