public final class MergeAlgorithm extends Object
HistogramDiff
is used as
diff algorithm.Constructor and Description |
---|
MergeAlgorithm()
Creates a new MergeAlgorithm which uses
HistogramDiff as diff algorithm |
MergeAlgorithm(DiffAlgorithm diff)
Creates a new MergeAlgorithm
|
Modifier and Type | Method and Description |
---|---|
ContentMergeStrategy |
getContentMergeStrategy()
Retrieves the
ContentMergeStrategy . |
<S extends Sequence> |
merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs)
Does the three way merge between a common base and two sequences.
|
void |
setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the
ContentMergeStrategy . |
public MergeAlgorithm()
HistogramDiff
as diff algorithmpublic MergeAlgorithm(DiffAlgorithm diff)
diff
- the diff algorithm used by this merge@NonNull public ContentMergeStrategy getContentMergeStrategy()
ContentMergeStrategy
.ContentMergeStrategy
in effectpublic void setContentMergeStrategy(ContentMergeStrategy strategy)
ContentMergeStrategy
.strategy
- ContentMergeStrategy
to set; if null
, set
ContentMergeStrategy.CONFLICT
public <S extends Sequence> MergeResult<S> merge(SequenceComparator<S> cmp, S base, S ours, S theirs)
cmp
- comparison method for this execution.base
- the common base sequenceours
- the first sequence to be mergedtheirs
- the second sequence to be mergedCopyright © 2021 Eclipse JGit Project. All rights reserved.