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>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index cf716cbf400af8915fa5b49c13e8a60e189d8573..aea84a1e2aaad7d4839ed548306101016bd03679 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -471,7 +471,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                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));