summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-747261-arch-specific-conflicts
AgeCommit message (Expand)Author
2014-05-10add an additional test for arch specific conflictsDavid Kalnischkies