aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
Commit message (Expand)AuthorAgeFilesLines
* Merge: Add diff3 style merge conflict formatter.Haamed Gheibi2023-07-311-3/+11
* 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-7/+18
* Fix Javadoc warningsRobin Stocker2010-07-271-3/+2
* Remove unnecessary semicolon in MergeChunkShawn O. Pearce2010-01-061-1/+2
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+142