| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix _args -> args since we now use it. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Print the string "timing" and the name of the program in merge timing info. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Print timing information in merge_fetch too. | Linus Nordberg | 2015-11-10 | 1 | -0/+4 |
| | | |||||
| * | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -12/+36 |
| | | | | | | | | 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/+97 |
 |
index : user/map/catlfish.git | |
| Magnus' CT repository | Magnus Ahltorp |
| summaryrefslogtreecommitdiff |