aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
Commit message (Expand)AuthorAgeFilesLines
* Fix @since tags in JGit, version 2.4 never existedTomasz Zarna2013-03-211-0/+2
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+67