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.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t