Mercurial > evolve
diff tests/test-stablesort-branchpoint.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 | 064738ae1588 |
children | 4303a46b4167 57030b9d71c3 |