summaryrefslogtreecommitdiff
path: root/test/integration/test-conflicts-loop
Commit message (Expand)AuthorAgeFilesLines
* create "real" testcases out of the tests for chrisDavid Kalnischkies2011-10-171-1/+18
* Added test for conflicts loopChristopher Baines2011-07-131-0/+18