Package | Description |
---|---|
org.eclipse.jgit.diff |
Comparing file contents by computing diffs.
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Class | Description |
---|---|---|
class |
HashedSequenceComparator<S extends Sequence> |
Wrap another comparator for use with
HashedSequence . |
class |
RawTextComparator |
Equivalence function for
RawText . |
class |
SubsequenceComparator<S extends Sequence> |
Wrap another comparator for use with
Subsequence . |
Modifier and Type | Method | Description |
---|---|---|
<S extends Sequence> |
DiffAlgorithm.diff(SequenceComparator<? super S> cmp,
S a,
S b) |
Compare two sequences and identify a list of edits between them.
|
abstract <S extends Sequence> |
DiffAlgorithm.diffNonCommon(SequenceComparator<? super S> cmp,
S a,
S b) |
Compare two sequences and identify a list of edits between them.
|
<S extends Sequence> |
LowLevelDiffAlgorithm.diffNonCommon(SequenceComparator<? super S> cmp,
S a,
S b) |
Constructor | Description |
---|---|
HashedSequencePair(SequenceComparator<? super S> cmp,
S a,
S b) |
Construct a pair to provide fast hash codes.
|
SubsequenceComparator(SequenceComparator<? super S> cmp) |
Construct a comparator wrapping another comparator.
|
Modifier and Type | Method | Description |
---|---|---|
<S extends Sequence> |
MergeAlgorithm.merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs) |
Does the three way merge between a common base and two sequences.
|
Copyright © 2018. All rights reserved.