Remove unused logger from RecursiveMerger
JGit doesn't currently use java.util.logging.Logger. Remove this
never-used Logger introduced in ab99b78ca0
(Implement recursive
merge strategy, 2013-02-21) to make that easier to see.
Change-Id: I92c578e7f3617085a667de7c992174057be3eb71
This commit is contained in:
parent
2af9a4c7b1
commit
31d79ae0af
|
@ -53,7 +53,6 @@
|
|||
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 @@
|
|||
* @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
|
||||
|
|
Loading…
Reference in New Issue