diff tests/test-evolve-effectflags.t @ 3828:c58ebf5d2f57

tests: add more test of --stop while resolving content-divergence This tests the --stop flag when conflicts occur while relocating one of the divergent changesets.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 01:00:57 +0530
parents d166b3dc5e8a
children 98941c28f3e2 900668a93629
line wrap: on
line diff