summaryrefslogtreecommitdiff
path: root/test/integration/test-conflicts-loop
Commit message (Expand)AuthorAgeFilesLines
* Added test for conflicts loopChristopher Baines2011-07-131-0/+18