Mercurial > evolve

diff docs/sharing.rst @ 3848:90f1a64875ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: introduce a resolutionparent variable and store it in evolvestate This patch introduces a resolutionparent variable which will be the parent of final changeset after resolving content-divergent changesets. Till now, the parent is always the parent of one of the divergent node, but now in upcoming cases, it can be a successor of both the parents of divergent nodes.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 14 Jun 2018 01:06:12 +0530
parents 0afd41ac31d2
children 8406d9b06130
line wrap: on
line diff