diff options
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java | 3 |
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 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 |