summaryrefslogtreecommitdiff
path: root/test/integration/test-conflicts-loop
AgeCommit message (Collapse)Author
2012-03-13cherry pick r2226Michael Vogt
2011-10-17create "real" testcases out of the tests for chrisDavid Kalnischkies
2011-07-13Added test for conflicts loopChristopher Baines