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>

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));