summaryrefslogtreecommitdiff
path: root/merge
Commit message (Expand)AuthorAgeFilesLines
* Add missing file.Linus Nordberg2017-02-071-0/+172
* Parallelised merge, sth phase.Linus Nordberg2017-02-073-28/+31
* 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.Linus Nordberg2017-02-015-0/+266