diff options
| author | Jonathan Nieder <jrn@google.com> | 2013-04-26 10:16:09 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2013-04-26 10:16:09 -0700 |
| commit | 31d79ae0afd00c6d0a4ee2757cd6e69059fa9865 (patch) | |
| tree | 2b6c158f5e3414a52e937ad196b2807a08be897d /org.eclipse.jgit | |
| parent | 2af9a4c7b1b2581fd55722d69185d5be114f84e2 (diff) | |
| download | jgit-31d79ae0afd00c6d0a4ee2757cd6e69059fa9865.tar.gz jgit-31d79ae0afd00c6d0a4ee2757cd6e69059fa9865.zip | |
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
Diffstat (limited to 'org.eclipse.jgit')
| -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 |