Mercurial > evolve

diff tests/testlib/topic_setup.sh @ 3823:7b33a6ed0539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add test for --stop flag when resolving multiparents content-div This patch adds a test for --stop flag when we are in an interrupted content-divergent resolution which have multiple parents. Conflicts happen we merge the divergent changesets after relocation. The test shows that we need to strip the relocated changeset.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 10 Jun 2018 22:38:08 +0530
parents fa2deeb5dd03
children 044ce00dfa88
line wrap: on
line diff