diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-09-24 16:47:32 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-09-27 13:38:30 +0200 |
| commit | 38722592047855cedd4ef2701854638bd50e0467 (patch) | |
| tree | 229a7e5718b0d4c9750918d654484dba354f5194 /Emakefile | |
| parent | 7fd70ad913ecdb2585d50d27763d00f30a1e5a6f (diff) | |
Merge is now run by shell script tools/merge.
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.
TODO: test backupquorum != 0
Diffstat (limited to 'Emakefile')
0 files changed, 0 insertions, 0 deletions