diff tests/test-push-checkheads-superceed-A4.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 21f06d932231
children 2280461343e5 62b60fc1983d
line wrap: on
line diff