/* * Copyright (C) 2010, Christian Halstrick , * Copyright (C) 2010, Matthias Sohn 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.Config; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.Repository; /** * A three-way merge strategy performing a content-merge if necessary */ public class StrategyResolve extends ThreeWayMergeStrategy { @Override public ThreeWayMerger newMerger(Repository db) { return new ResolveMerger(db, false); } @Override public ThreeWayMerger newMerger(Repository db, boolean inCore) { return new ResolveMerger(db, inCore); } @Override public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { return new ResolveMerger(inserter, config); } @Override public String getName() { return "resolve"; //$NON-NLS-1$ } }