aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
Commit message (Expand)AuthorAgeFilesLines
* Add file content merge algorithmChristian Halstrick2010-01-061-0/+155