summaryrefslogtreecommitdiff
path: root/test/integration/test-conflicts-loop
AgeCommit message (Expand)Author
2011-07-13Added test for conflicts loopChristopher Baines