summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java
Commit message (Expand)AuthorAgeFilesLines
* [performance] Remove synthetic access$ methods in dfs, diff and mergeAndrey Loskutov2015-10-281-2/+2
* Fix API errors raised on ResolveMerger affecting API providers onlyChristian Halstrick2014-07-311-0/+1
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+12
* Refactor diff sequence APIShawn O. Pearce2010-09-061-4/+7
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+161