You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ThreeWayMergeStrategy.java 729B

1234567891011121314151617181920212223242526
  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. package org.eclipse.jgit.merge;
  11. import org.eclipse.jgit.lib.Repository;
  12. /**
  13. * A merge strategy to merge 2 trees, using a common base ancestor tree.
  14. */
  15. public abstract class ThreeWayMergeStrategy extends MergeStrategy {
  16. /** {@inheritDoc} */
  17. @Override
  18. public abstract ThreeWayMerger newMerger(Repository db);
  19. /** {@inheritDoc} */
  20. @Override
  21. public abstract ThreeWayMerger newMerger(Repository db, boolean inCore);
  22. }