View Javadoc
1   /*
2    * Copyright (C) 2012, Research In Motion Limited and others
3    *
4    * This program and the accompanying materials are made available under the
5    * terms of the Eclipse Distribution License v. 1.0 which is available at
6    * https://www.eclipse.org/org/documents/edl-v10.php.
7    *
8    * SPDX-License-Identifier: BSD-3-Clause
9    */
10  
11  package org.eclipse.jgit.merge;
12  
13  import org.eclipse.jgit.lib.Config;
14  import org.eclipse.jgit.lib.ObjectInserter;
15  import org.eclipse.jgit.lib.Repository;
16  
17  /**
18   * A three-way merge strategy performing a content-merge if necessary
19   *
20   * @since 3.0
21   */
22  public class StrategyRecursive extends StrategyResolve {
23  
24  	/** {@inheritDoc} */
25  	@Override
26  	public ThreeWayMerger newMerger(Repository db) {
27  		return new RecursiveMerger(db, false);
28  	}
29  
30  	/** {@inheritDoc} */
31  	@Override
32  	public ThreeWayMerger newMerger(Repository db, boolean inCore) {
33  		return new RecursiveMerger(db, inCore);
34  	}
35  
36  	/** {@inheritDoc} */
37  	@Override
38  	public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
39  		return new RecursiveMerger(inserter, config);
40  	}
41  
42  	/** {@inheritDoc} */
43  	@Override
44  	public String getName() {
45  		return "recursive"; //$NON-NLS-1$
46  	}
47  }