aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java
Commit message (Expand)AuthorAgeFilesLines
* 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-3/+4
* Fix @since tags of new API added after 4.7.0Matthias Sohn2017-04-061-0/+3
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-1/+8
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-1/+1
* Extend merge support for bare repositoriesDmitry Fink2010-09-241-1/+7
* Added merge strategy RESOLVEChristian Halstrick2010-08-311-0/+61