summaryrefslogtreecommitdiff
path: root/test/conflict1.test
AgeCommit message (Collapse)AuthorFilesLines
2012-02-23test: rewrite the testing framework to use the real appletsTimo Teräs1-0/+7
also merge the expected output to the *.test files.