summaryrefslogtreecommitdiff
path: root/tests.merging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/b...Richard Maw2013-01-216-24/+6
|\
| * tests.merging/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
|/
* Tidy up command testsSam Thursfield2012-11-149-20/+37
* Consolidate checks for python versionRichard Maw2012-11-136-30/+6
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-0714-64/+64
* Fix mistake in renaming tests that breaks ./check on SqueezeSam Thursfield2012-10-313-4/+4
* Add missing teardown script to tests.mergingSam Thursfield2012-10-311-0/+22
* Split merge tests out from the other branching testsSam Thursfield2012-10-2924-0/+688