Mercurial > evolve
diff tests/test-push-checkheads-unpushed-D6.t @ 3804:509b1e66f0b9
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 | 21f06d932231 |
children | 2280461343e5 62b60fc1983d |