motiejus
/
jgit
1
Fork 0
Code Releases Activity

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:
Matthias Sohn 2010-12-03 09:24:31 +01:00
parent 39fe52ccc7
commit 37001ddc8d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -471,7 +471,7 @@ private boolean contentMerge(CanonicalTreeParser base,
base.getEntryObjectId(), db);
// do the merge
MergeResult<RawText> result = MergeAlgorithm.merge(
MergeResult<RawText> result = mergeAlgorithm.merge(
RawTextComparator.DEFAULT, baseText,
getRawText(ours.getEntryObjectId(), db),
getRawText(theirs.getEntryObjectId(), db));