aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java
Commit message (Expand)AuthorAgeFilesLines
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-2/+1
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Enable and fix "Statement unnecessarily nested within else clause" warningsDavid Pursehouse2019-10-171-4/+4
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-4/+4
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-5/+9
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-0/+12
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-1/+20
* Implement recursive merge strategyGeorge C. Young2013-02-221-1/+2
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-211-27/+2
* Extend merge support for bare repositoriesDmitry Fink2010-09-241-0/+12
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+136