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
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;
* @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