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.
test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t