diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2010-12-03 09:24:31 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2010-12-03 09:24:31 +0100 |
| commit | 37001ddc8df83237840896ed82fe584a9163c698 (patch) | |
| tree | a64385a7a8708940cfbc7a62b208f1a5b747e06f /org.eclipse.jgit | |
| parent | 39fe52ccc7db41db5a066663beb2d8428d02c706 (diff) | |
| download | jgit-37001ddc8df83237840896ed82fe584a9163c698.tar.gz jgit-37001ddc8df83237840896ed82fe584a9163c698.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
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<RawText> result = MergeAlgorithm.merge( + MergeResult<RawText> result = mergeAlgorithm.merge( RawTextComparator.DEFAULT, baseText, getRawText(ours.getEntryObjectId(), db), getRawText(theirs.getEntryObjectId(), db)); |