From 31d79ae0afd00c6d0a4ee2757cd6e69059fa9865 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 26 Apr 2013 10:16:09 -0700 Subject: [PATCH] Remove unused logger from RecursiveMerger 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 --- .../src/org/eclipse/jgit/merge/RecursiveMerger.java | 3 --- 1 file changed, 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 540d6a8c66..5802850a30 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 -- 2.39.5