summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-747261-arch-specific-conflicts
Commit message (Expand)AuthorAgeFilesLines
* (try to) fix travis-ci build failuresDavid Kalnischkies2014-05-291-0/+15
* add an additional test for arch specific conflictsDavid Kalnischkies2014-05-161-0/+36