summaryrefslogtreecommitdiff
path: root/doc/merge.txt
Commit message (Collapse)AuthorAgeFilesLines
* Minor wording.Linus Nordberg2016-12-121-2/+2
|
* Add a bit of documentation.Linus Nordberg2016-11-251-3/+3
|
* Added description of current merge implementationMagnus Ahltorp2016-03-181-0/+60
|
* Add documentation.pmerge-rebasedLinus Nordberg2015-11-101-0/+31