summaryrefslogtreecommitdiff
path: root/doc/merge.txt
Commit message (Expand)AuthorAgeFilesLines
* Add documentation.Linus Nordberg2015-11-101-0/+31