]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 39fe52c) | patch
Fix jgit build broken by deabacc4 15/2015/1
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 3 Dec 2010 08:24:31 +0000 (09:24 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 3 Dec 2010 08:24:31 +0000 (09:24 +0100)
commit37001ddc8df83237840896ed82fe584a9163c698
treea64385a7a8708940cfbc7a62b208f1a5b747e06ftree | snapshot
parent39fe52ccc7db41db5a066663beb2d8428d02c706commit | diff
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 diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit