view .hgignore @ 5514:4c3656aaacc6

evolve: make sure we don't miss merging content of divergent changesets

It was skipping _mergecontentdivergents() in the continue case of
content-divergence when we hit merge conflict in relocation of
"divergent" and relocation of "other" is not required.
And because of this skip, merging the content of two divergent
changesets was not performed correctly.

Changes in test file reflect the fixed behavior.

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/