view debian/compat @ 3791:63d6d024dfb2

tests: add more test of --abort flag for content-divergence resolution

This patch adds test when we resolve multiple content-divergence changesets at
once and resolution fo first content-divergence does not form new commits,
resolution of second one leads to conflicts.

As the output shows, we are wrongly stripping a changeset here, which should be
fixed in next patch.

8