aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary semicolon in MergeChunkShawn O. Pearce2010-01-061-1/+2
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+142