From 37001ddc8df83237840896ed82fe584a9163c698 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 3 Dec 2010 09:24:31 +0100 Subject: [PATCH] Fix jgit build broken by deabacc4 Since 049827d7 MergeAlgorithm isn't static anymore. Change-Id: I3d704f663a776bb57e59f28a8200753fae5e9d25 Signed-off-by: Matthias Sohn --- org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf716cbf40..aea84a1e2a 100644 --- 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 result = MergeAlgorithm.merge( + MergeResult result = mergeAlgorithm.merge( RawTextComparator.DEFAULT, baseText, getRawText(ours.getEntryObjectId(), db), getRawText(theirs.getEntryObjectId(), db)); -- 2.39.5