summaryrefslogtreecommitdiff
path: root/test/conflict1.expect
AgeCommit message (Expand)AuthorFilesLines
2012-02-23test: rewrite the testing framework to use the real appletsTimo Teräs1-2/+0
2011-10-24solver, pkg: implement versioned conflictsTimo Teräs1-0/+2