aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java
Commit message (Expand)AuthorAgeFilesLines
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-2/+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-1/+5
* Extend merge support for bare repositoriesDmitry Fink2010-09-241-0/+3
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+52