summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
Commit message (Expand)AuthorAgeFilesLines
* DirCache: Add helper to read from a treeShawn Pearce2015-11-291-30/+1
* Use AutoClosable to close resources in bundle org.eclipse.jgitMatthias Sohn2015-05-211-8/+9
* Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-4/+8
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-10/+10
* ResolveMerger: Use the ObjectReader to access objectsShawn Pearce2014-08-151-1/+1
* RecursiveMerger: do not insert virtual commits into repositoryShawn Pearce2014-08-081-14/+21
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-2/+1
* Fixed message for exception thrown during recursive mergeChristian Halstrick2014-07-281-4/+2
* Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-251-0/+6
* Remove unused logger from RecursiveMergerJonathan Nieder2013-04-261-3/+0
* Add missing @since tagsMatthias Sohn2013-03-221-2/+1
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+274