Mercurial > evolve

comparison tests/test-evolve-abort-contentdiv.t @ 3810:04fe01b0c0d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add more test of resolution of content-divergent changesets This patch adds test of resolution of content-divergent changesets when relocation is required and it leads to conflicts. The test shows that we are not doing the right thing. This will be fixed in upcoming patches.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 07 Jun 2018 22:45:54 +0530
parents bb7d1616407f
children fb821ed44f86
comparison
equal deleted inserted replaced
3809:f06ff8fee2f6 3810:04fe01b0c0d0