Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added permdb support to mergecatlfish-78 | Magnus Ahltorp | 2016-07-08 | 1 | -4/+5 |
* | 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 |