Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Parallelised merge, distribution phase.erlmerge_dist | Linus Nordberg | 2017-02-01 | 1 | -1/+1 |
| | |||||
* | Test failing merge backup | Magnus Ahltorp | 2016-10-14 | 1 | -0/+2 |
| | | | | Refactor tests | ||||
* | Quote '$@' in shell script. | Linus Nordberg | 2015-11-10 | 1 | -4/+4 |
| | |||||
* | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -0/+8 |
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 |