Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
AgeCommit message (Expand)AuthorFilesLines
2010-08-30Added merge strategy RESOLVEChristian Halstrick1-2/+65
2010-08-19Enhance MergeResult to report conflicts, etcChristian Halstrick1-14/+119
2010-05-24Add a merge command to the jgit APIStefan Lay1-0/+150

    Back to the top