| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | WIP | Linus Nordberg | 2016-11-23 | 1 | -2/+7 |
| | | | | | | | | | | | | Merge can run as four separate processes, plus a fifth controlling proces 'merge'. Tests are limited to testcase1.py and they're failing because of the test with the dead merge secondary. Tests are also time consuming because they're waiting for 60s each time a merge needs to be verified. This could be improved by peeking at the control files, for example. | ||||
| * | Add a bit of documentation. | Linus Nordberg | 2016-11-17 | 1 | -3/+3 |
| | | |||||
| * | Added description of current merge implementation | Magnus Ahltorp | 2016-03-18 | 1 | -0/+60 |
| | | |||||
| * | Add documentation.pmerge-rebased | Linus Nordberg | 2015-11-10 | 1 | -0/+31 |
 |
index : user/linus/catlfish.git | |
| Linus' CT repository | Linus Nordberg |
| summaryrefslogtreecommitdiff |