diff setup.cfg @ 3841:82b79a8dafd9

tests: add test about aborting content-divergence when multiple parents This patch adds tests for --abort flag of hg evolve command when we are resolving content-divergence which are on different parents and parent of one of them is the gca of both of them. The tests shows that we are doing good and we should advertise the flag during conflicts.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 12 Jun 2018 03:29:13 +0530
parents b81d3775006b
children
line wrap: on
line diff