Mercurial > evolve
comparison tests/test-stablesort-criss-cross.t @ 3828:c58ebf5d2f57
tests: add more test of --stop while resolving content-divergence
This tests the --stop flag when conflicts occur while relocating one of the
divergent changesets.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 11 Jun 2018 01:00:57 +0530 |
| parents | eadbe24a93f8 |
| children | 85cdce113c2c 57030b9d71c3 |
comparison
equal
deleted
inserted
replaced
| 3827:82c72eb37f85 | 3828:c58ebf5d2f57 |
|---|