Mercurial > evolve
comparison tests/test-evolve-orphan-corner-cases.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 | b62ed7c69561 |
| children | 79bc0f1a832e |
comparison
equal
deleted
inserted
replaced
| 5578:b0234a269f29 | 5579:6289ddfb9d48 |
|---|