summaryrefslogtreecommitdiff
path: root/tools/merge_sth.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-09-271-0/+123
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0