summaryrefslogtreecommitdiff
path: root/merge/src
Commit message (Expand)AuthorAgeFilesLines
* Add a bit of status and debug printout.Linus Nordberg2017-02-061-2/+6
* Parallelised merge, backup phase.Linus Nordberg2017-02-025-78/+278
* Parallelised merge, distribution phase.erlmerge_distLinus Nordberg2017-02-014-0/+253