docs/figures/hgview-example.png
author Pulkit Goyal <7895pulkit@gmail.com>
Fri, 15 Jun 2018 00:16:29 +0530
changeset 3852 629558d09898
parent 506 404e926658bc
permissions -rw-r--r--
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.

(binary:image/png)