Mercurial > evolve

comparison tests/test-userguide.t @ 5513:a8c21707e9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add test to show broken --continue case of content divergence This test case demonstrates that during the resolution of content divergence which includes relocation of "divergent" side but not "other" and results in merge conflict during relocation, we can lose some changes. Next patch will fix this bug.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 05 Aug 2020 00:16:26 +0530
parents c9798965b1f4
children 3810ca63398f 12c53d7122a7
comparison
equal deleted inserted replaced
5510:9fef6f8790a5 5513:a8c21707e9c4