summaryrefslogtreecommitdiff
path: root/tools/merge
Commit message (Expand)AuthorAgeFilesLines
* Parallelised merge, distribution phase.Linus Nordberg2017-02-011-1/+1
* Test failing merge backupMagnus Ahltorp2016-10-141-0/+2
* Quote '$@' in shell script.Linus Nordberg2015-11-101-4/+4
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-0/+8