view .hgignore @ 3551:ce346c6165c6

prev: prompt user to choose parent in case of multiple parents

This patch adds functionality to `hg prev` to prompt user to choose one parent
to update when multiple parents exist.

Surprisingly there were no tests for this case before this patch, I added one
with this patch.

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/