Mercurial > evolve
view debian/docs @ 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.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 24 May 2018 17:04:20 +0530 |
| parents | d1ca81f9e458 |
| children | 9e0f91cb5242 |