Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual rebase onto master with map/robust-distribution. | Linus Nordberg | 2016-11-25 | 1 | -28/+219 |
* | Add a bit of documentation. | Linus Nordberg | 2016-11-25 | 1 | -1/+4 |
* | Use sessions in merge_fetch | Magnus Ahltorp | 2016-11-18 | 1 | -14/+16 |
* | Added permdb support to merge | Magnus Ahltorp | 2016-07-11 | 1 | -4/+5 |
* | Remove debug printouts from merge programs. | Linus Nordberg | 2015-11-20 | 1 | -1/+1 |
* | 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 |
* | Split merge.py into three pieces. | Linus Nordberg | 2015-11-10 | 1 | -0/+97 |