Fix jgit build broken by deabacc4
Since 049827d7
MergeAlgorithm isn't static anymore.
Change-Id: I3d704f663a776bb57e59f28a8200753fae5e9d25
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
39fe52ccc7
commit
37001ddc8d
|
@ -471,7 +471,7 @@ private boolean contentMerge(CanonicalTreeParser base,
|
||||||
base.getEntryObjectId(), db);
|
base.getEntryObjectId(), db);
|
||||||
|
|
||||||
// do the merge
|
// do the merge
|
||||||
MergeResult<RawText> result = MergeAlgorithm.merge(
|
MergeResult<RawText> result = mergeAlgorithm.merge(
|
||||||
RawTextComparator.DEFAULT, baseText,
|
RawTextComparator.DEFAULT, baseText,
|
||||||
getRawText(ours.getEntryObjectId(), db),
|
getRawText(ours.getEntryObjectId(), db),
|
||||||
getRawText(theirs.getEntryObjectId(), db));
|
getRawText(theirs.getEntryObjectId(), db));
|
||||||
|
|
Loading…
Reference in New Issue