summaryrefslogtreecommitdiff
path: root/merge
Commit message (Collapse)AuthorAgeFilesLines
* Don't use 'if' after all.Linus Nordberg2017-02-081-5/+3
| | | | 'case' reads better IMO.
* Use the minsize file.Linus Nordberg2017-02-072-3/+9
|
* 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.erlmerge_distLinus Nordberg2017-02-015-0/+266