Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove obsolete merging hack from merge conflict test | Sam Thursfield | 2012-09-27 | 1 | -12/+0 |
* | Fix merge tests on Squeeze, by disabling them correctly | Sam Thursfield | 2012-09-27 | 1 | -0/+2 |
* | Add merge conflict tests | Sam Thursfield | 2012-09-25 | 1 | -0/+95 |