summaryrefslogtreecommitdiff
path: root/tools/merge
Commit message (Collapse)AuthorAgeFilesLines
* Parallelised merge, distribution phase.erlmerge_distLinus Nordberg2017-02-011-1/+1
|
* Test failing merge backupMagnus Ahltorp2016-10-141-0/+2
| | | | Refactor tests
* 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
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0