summaryrefslogtreecommitdiff
path: root/test/conflict2.test
AgeCommit message (Expand)AuthorFilesLines
2012-02-23test: rewrite the testing framework to use the real appletsTimo Teräs1-0/+6