A side effect of the previous commit ( ea9a756eea ) 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>
ea9a756eea
