Mercurial > evolve
diff tests/test-push-checkheads-pruned-B1.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 | 21f06d932231 |
children | 2280461343e5 62b60fc1983d |