1 /*
2 * Copyright (C) 2009, Google Inc. 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.Repository;
14
15 /**
16 * A merge strategy to merge 2 trees, using a common base ancestor tree.
17 */
18 public abstract class ThreeWayMergeStrategy extends MergeStrategy {
19 /** {@inheritDoc} */
20 @Override
21 public abstract ThreeWayMerger newMerger(Repository db);
22
23 /** {@inheritDoc} */
24 @Override
25 public abstract ThreeWayMerger newMerger(Repository db, boolean inCore);
26 }