Mercurial > evolve

diff tests/test-exchange-obsmarkers-case-B6.t @ 3804:509b1e66f0b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add tests for resolving content-divergence with parent change This patch adds a new test file test-evolve-content-divergence.t which tests the resolution of content divergence when the divergent changesets does not have the same parents.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 01 Jun 2018 19:57:19 +0530
parents e6bea259c227
children 98941c28f3e2 62b60fc1983d
line wrap: on
line diff