aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
Commit message (Expand)AuthorAgeFilesLines
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-4/+0
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-0/+4
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-0/+7
* Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-261-1/+1
* 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