view .hgignore @ 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.

syntax: re
/figures/[^/]+\.png$
^html/
\.pyc$
~$
\.swp$
\.orig$
\.rej$
^tests/.*\.err$
^tests/easy_run.sh$
^build/
^dist/
^MANIFEST$
^docs/tutorials/.*\.rst$
\.ico$
tests/\.testtimes

^docs/training/graphs/
^docs/training/html/
^docs/training/index.html
^docs/training/graphviz-images/
^docs/training/img/
^docs/training/output/
^docs/training/pandocfilters/