aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java
Commit message (Expand)AuthorAgeFilesLines
* RecursiveMergerTest: Open FileOutputStream in try-with-resourceDavid Pursehouse2018-02-261-33/+28
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-3/+3
* RecursiveMergerTest: Open TreeWalk and BufferedReader in try-with-resourceDavid Pursehouse2016-02-121-15/+14
* Access static member LocalDiskRepositoryTestCase.CONTENT directlyMatthias Sohn2015-07-141-6/+7
* Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-0/+63
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+83
* Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-251-1/+179
* JGit 3.0: move internal classes into an internal subpackageShawn Pearce2013-03-181-1/+1
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+578