diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-27 08:55:32 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-27 08:55:32 -0400 |
| commit | a5e78a3f067bc71314958b717d5b82a185eef8fa (patch) | |
| tree | 19e52630ec58eac1276f4061b4632532e72c5ec9 | |
| parent | 664d738c9fe8fffaecf6cd7ba3a88a5b76b03b6a (diff) | |
| parent | 31d79ae0afd00c6d0a4ee2757cd6e69059fa9865 (diff) | |
| download | jgit-a5e78a3f067bc71314958b717d5b82a185eef8fa.tar.gz jgit-a5e78a3f067bc71314958b717d5b82a185eef8fa.zip | |
Merge "Remove unused logger from RecursiveMerger"
| -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 |