Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove dead code from the end of test | Sam Thursfield | 2012-09-27 | 1 | -20/+1 |
| | | | | | This code made no sense, but since the previous command was expected to fail it didn't have any effect on the test. | ||||
* | Fix merge tests on Squeeze, by disabling them correctly | Sam Thursfield | 2012-09-27 | 1 | -1/+3 |
| | |||||
* | Add merge conflict tests | Sam Thursfield | 2012-09-25 | 1 | -0/+117 |