(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.

syntax: glob

*.pyc
*.pyo
*~
*.swp
*.orig
*.rej
.DS_Store

build/*
MANIFEST