Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -7/+51 |
| | | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 | ||||
* | Split merge.py into three pieces. | Linus Nordberg | 2015-11-10 | 1 | -0/+108 |