Mercurial > evolve

diff tests/test-topic-push.t @ 3789:13eef43a961f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: pass the base revision in _completecontentdivergent() We need the base revision to merge commit messages, branches and more stuff. Let's make sure we have that by passing into the function which completes the divergence resolution.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 05 Jun 2018 03:51:01 +0530
parents 1bc4b0807c37
children 537fd9a86c06 cbfd36046969
line wrap: on
line diff