Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/add012.py
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@petra.hos.u-szeged.hu>2007-08-04 17:08:03 +0200
committerDan McGee <dan@archlinux.org>2007-08-12 21:14:05 -0400
commitb96922679e4ed14aa687bf194b766d82a1d10577 (patch)
tree221e0f21e0da80e754c6d029a20175720eb1909f /pactest/tests/add012.py
parentdc5e6d5d87ceee61c38a8ecc2a87e99d49887b83 (diff)
Add two pactest for versioned conflicts.
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>
Diffstat (limited to 'pactest/tests/add012.py')
0 files changed, 0 insertions, 0 deletions