aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoMergeBaseException.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-5.6'Matthias Sohn2020-02-221-1/+1
|\
| * Remove redundant "static" qualifier from enum declarationsDavid Pursehouse2020-02-191-1/+1
* | Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
|/
* Fix javadoc in org.eclipse.jgit errors packageMatthias Sohn2017-12-181-0/+2
* Fix @since tags in JGit, version 2.4 never existedTomasz Zarna2013-03-211-0/+2
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+124