Mercurial > evolve

diff tests/test-uncommit-interactive.t @ 3978:fb8e44c70798 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: set the second parent if we get conflicts while evolving This patch makes sure we set the second parent correctly if we run into conflicts while evolving. Also, we need to make sure to reset to one parent before committing.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sat, 18 Aug 2018 21:03:45 +0530
parents d4c457c1ae0d
children 98941c28f3e2 a2fdbece7ce1 90f94231db5d
line wrap: on
line diff