user/map/catlfish.git/tools/merge, branch robust-distribution Magnus' CT repository Test failing merge backup 2016-10-14T14:54:57+00:00 Magnus Ahltorp map@kth.se 2016-10-14T14:54:57+00:00 c8af4e40e0096f60a5cf5039be775ff002619c4d Refactor tests 
Refactor tests
Quote '$@' in shell script. 2015-11-10T11:48:47+00:00 Linus Nordberg linus@nordu.net 2015-10-05T13:50:07+00:00 5980ad90b48623afb0c6135339fa6e5b1191d752 






Merge is now run by shell script tools/merge.
2015-11-10T11:48:46+00:00

Linus Nordberg
linus@nordu.net

2015-09-24T14:47:32+00:00

aaed8aff7c425c8ac2a15e584e24317da327f5e4

tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0





tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0