diff tests/test-evolve-content-divergent-meta.t @ 5015:43f4784a3f21

evolve: add test for `--continue` case when relocating "divergent" This test shows that for now we don't handle the continue case when relocating "divergent" cset hit merge conflict while resolving content-divergence. Next patch will be adding the support for --continue case.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 25 Nov 2019 21:28:52 +0530
parents 18fe83bf7b14
children 1f92a6aa40d6
line wrap: on
line diff