summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-48/+54
| | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0
* Get the imports correct.Linus Nordberg2015-11-101-2/+2
|
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+130