hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change. [ original upstream message ]

syntax: glob

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

build/*
MANIFEST