view .hg-format-source @ 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.

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}