org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

/*
 * Copyright (C) 2009, Google Inc. and others
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Distribution License v. 1.0 which is available at
 * https://www.eclipse.org/org/documents/edl-v10.php.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

package org.eclipse.jgit.merge;

import org.eclipse.jgit.lib.Repository;

/**
 * A merge strategy to merge 2 trees, using a common base ancestor tree.
 */
public abstract class ThreeWayMergeStrategy extends MergeStrategy {
	@Override
	public abstract ThreeWayMerger newMerger(Repository db);

	@Override
	public abstract ThreeWayMerger newMerger(Repository db, boolean inCore);
}