Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-C4.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 | e6bea259c227 |
children | d5adce52cef4 62b60fc1983d |
comparison
equal
deleted
inserted
replaced
3851:9ebed1e95ef7 | 3852:629558d09898 |
---|