Mercurial > evolve

diff tests/test-exchange-obsmarkers-case-B6.t @ 3852:629558d09898

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 98941c28f3e2 62b60fc1983d
line wrap: on
line diff