Mercurial > evolve

diff tests/test-evolve-orphan-merge.t @ 5015:43f4784a3f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2371d40f0878
children 7fa4bb23a78a
line wrap: on
line diff