view .hgignore @ 3812:25dfa95c37fd stable

next-prev: add tests showing --merge not respected in some cases

This patch adds tests which show that --merge is not respected when you set
commands.update.check to any value.

This is a bug I wrote few days ago and will fix it in next changeset.
I like this process of writing bugs and fixing them.

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/