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

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 41fc764bf28c
children dda5b2134b32
comparison
equal deleted inserted replaced
3788:ae30da2e210d 3789:13eef43a961f