summaryrefslogtreecommitdiff
path: root/tests.branching/merge-with-stratum-renamed.script
Commit message (Expand)AuthorAgeFilesLines
* Disable tests on Debian Squeeze that require Python 2.7Sam Thursfield2012-09-241-0/+7
* tests.branching: Add complex merge testsSam Thursfield2012-09-171-0/+51