view .hgignore @ 993:6f274afc05c7

Clean up some merge logic

- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases

\.elc$
\.orig$
\.rej$
~$
\.so$
\.pyc$
\.swp$
\.prof$
^tests/.*\.err$
^build/
^dist/
^doc/.*\.[0-9](\.(x|ht)ml)?$
^MANIFEST$
^\.pc/
^patches/
^mercurial/__version__.py$