summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJonathan Nieder2013-04-26 13:16:09 (EDT)
committer Jonathan Nieder2013-04-26 13:16:09 (EDT)
commit31d79ae0afd00c6d0a4ee2757cd6e69059fa9865 (patch)
tree2b6c158f5e3414a52e937ad196b2807a08be897d
parent2af9a4c7b1b2581fd55722d69185d5be114f84e2 (diff)
downloadjgit-31d79ae0afd00c6d0a4ee2757cd6e69059fa9865.zip
jgit-31d79ae0afd00c6d0a4ee2757cd6e69059fa9865.tar.gz
jgit-31d79ae0afd00c6d0a4ee2757cd6e69059fa9865.tar.bz2
Remove unused logger from RecursiveMergerrefs/changes/43/12243/1
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
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
index 540d6a8..5802850 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
@@ -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