aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java
Commit message (Expand)AuthorAgeFilesLines
* 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