Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove mention of the cache directory inside .morph from spec | Lars Wirzenius | 2012-03-27 | 1 | -1/+1 |
| | |||||
* | Add note that the code does not yet match the code | Lars Wirzenius | 2012-03-27 | 1 | -0/+2 |
| | |||||
* | Add "morph merge" subcommand | Lars Wirzenius | 2012-03-23 | 1 | -2/+3 |
| | | | | | This is highly simplisitic, and it's going to be highly painful to use, but it does the very basics of what we need, I think. | ||||
* | Add documentation for branching and merging | Lars Wirzenius | 2012-03-22 | 1 | -0/+339 |