summaryrefslogtreecommitdiff
path: root/test/conflict2.expect
AgeCommit message (Expand)AuthorFilesLines
2011-10-24solver, pkg: implement versioned conflictsTimo Teräs1-0/+2