Browse Source

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>
stable-0.10
Matthias Sohn 14 years ago
parent
commit
37001ddc8d
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

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

Loading…
Cancel
Save