diff tests/test-topic.t @ 3852:629558d09898

evolve: raise error.InterventionRequired instead of Abort when conflicts error.InterventionRequired is a better error to raise in such cases. Thanks to marmoute for noticing this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 00:16:29 +0530
parents dda5b2134b32
children 5940e586efd9 54eade86ac31
line wrap: on
line diff