]> source.dussan.org Git - jgit.git/commitdiff
Remove unused logger from RecursiveMerger 43/12243/1
authorJonathan Nieder <jrn@google.com>
Fri, 26 Apr 2013 17:16:09 +0000 (10:16 -0700)
committerJonathan Nieder <jrn@google.com>
Fri, 26 Apr 2013 17:16:09 +0000 (10:16 -0700)
JGit doesn't currently use java.util.logging.Logger.  Remove this
never-used Logger introduced in ab99b78ca08a (Implement recursive
merge strategy, 2013-02-21) to make that easier to see.

Change-Id: I92c578e7f3617085a667de7c992174057be3eb71

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

index 540d6a8c66ea70da7274e28d863275ceba009193..5802850a30b1492d574906bdb9a45f503ff3879d 100644 (file)
@@ -53,7 +53,6 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 
 import org.eclipse.jgit.dircache.DirCache;
 import org.eclipse.jgit.dircache.DirCacheBuilder;
@@ -85,8 +84,6 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator;
  * @since 3.0
  */
 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
         * of merge bases exceeds this value