diff tests/test-prune.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 54a469cd5b26
children fbcf9e92097e 821e4be40c6c
line wrap: on
line diff