summaryrefslogtreecommitdiffstats
path: root/pactest/tests/conflict002.py
AgeCommit message (Collapse)AuthorFilesLines
2007-08-12Add two pactest for versioned conflicts.Nagy Gabor1-0/+13
A side effect of the previous commit ( ea9a756eeaca7398c0860b55f8abe2932ad195bd ) is that it's now possible to use versioned conflicts. Add two new conflict pactests for showing it. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>