view debian/docs @ 3810:04fe01b0c0d0

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 d1ca81f9e458
children 9e0f91cb5242
line wrap: on
line source

html
README