summaryrefslogtreecommitdiff
path: root/tests.merging/basic.script
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/b...Richard Maw2013-01-211-4/+1
|\
| * tests.merging/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-181-3/+0
|/
* Tidy up command testsSam Thursfield2012-11-141-2/+4
* Consolidate checks for python versionRichard Maw2012-11-131-4/+1
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-10/+10
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+86