diff tests/test-oldconvert.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 4dd84054ebbb
children a1dad44fe3da
line wrap: on
line diff