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 cf716cbf4..aea84a1e2 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 @@ private boolean contentMerge(CanonicalTreeParser base, 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));