Class MergeAlgorithm

java.lang.Object
org.eclipse.jgit.merge.MergeAlgorithm

public final class MergeAlgorithm extends Object
Provides the merge algorithm which does a three-way merge on content provided as RawText. By default HistogramDiff is used as diff algorithm.
  • Constructor Details

    • MergeAlgorithm

      public MergeAlgorithm()
      Creates a new MergeAlgorithm which uses HistogramDiff as diff algorithm
    • MergeAlgorithm

      public MergeAlgorithm(DiffAlgorithm diff)
      Creates a new MergeAlgorithm
      Parameters:
      diff - the diff algorithm used by this merge
  • Method Details