Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split merge tests out from the other branching tests | Sam Thursfield | 2012-10-29 | 1 | -1/+0 |
* | morph merge: Warn if a merge will cause unexpected petrification | Sam Thursfield | 2012-10-11 | 1 | -1/+1 |
* | Fix after review | Sam Thursfield | 2012-10-03 | 1 | -1/+1 |
* | tests.branching: Add complex merge tests | Sam Thursfield | 2012-09-17 | 1 | -0/+1 |