Mercurial > evolve
diff tests/test-topic-flow-single-head.t @ 5579:6289ddfb9d48
evolve: refactor some error raising logic in content-divergence
This patch makes sure that we raise error when it is ambiguous
for us to decide the resolution parent.
It modifies a test also to make sure that we don't loose
code coverage for some cases.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 21 Aug 2020 18:04:48 +0530 |
parents | a8ff17479fb8 |
children | f3e39a354378 caf302fb8f4d |