Mercurial > evolve
comparison tests/test-evolve-orphan-split.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 | 93deeed63908 |
| children | d5adce52cef4 8f54ab5dd4e2 |
comparison
equal
deleted
inserted
replaced
| 3788:ae30da2e210d | 3789:13eef43a961f |
|---|