|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object org.eclipse.jgit.merge.MergeAlgorithm
public final class MergeAlgorithm
Provides the merge algorithm which does a three-way merge on content provided
as RawText. By default HistogramDiff
is used as diff algorithm.
Constructor Summary | |
---|---|
MergeAlgorithm()
Creates a new MergeAlgorithm which uses HistogramDiff as diff
algorithm |
|
MergeAlgorithm(DiffAlgorithm diff)
Creates a new MergeAlgorithm |
Method Summary | ||
---|---|---|
|
merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs)
Does the three way merge between a common base and two sequences. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public MergeAlgorithm()
HistogramDiff
as diff
algorithm
public MergeAlgorithm(DiffAlgorithm diff)
diff
- the diff algorithm used by this mergeMethod Detail |
---|
public <S extends Sequence> MergeResult<S> merge(SequenceComparator<S> cmp, S base, S ours, S theirs)
S
- type of sequence.cmp
- comparison method for this execution.base
- the common base sequenceours
- the first sequence to be mergedtheirs
- the second sequence to be merged
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |