aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java
Commit message (Expand)AuthorAgeFilesLines
* Fix all Javadoc warnings and fail on themAntoine Musso2023-06-161-1/+0
* Remove redundant type argumentsThomas Wolf2021-09-301-1/+1
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Avoid double wordsMincong HUANG2018-12-211-1/+1
* Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-191-13/+15
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+4
* [performance] Remove synthetic access$ methods in dfs, diff and mergeAndrey Loskutov2015-10-281-2/+2
* Fix API errors raised on ResolveMerger affecting API providers onlyChristian Halstrick2014-07-311-0/+1
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+12
* Refactor diff sequence APIShawn O. Pearce2010-09-061-4/+7
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+161