topic: handle merge.update function signature change I think this is backwards compatible with how it used to be called, but I didn't worry about it too much either.

syntax: glob
*.orig
*.pyc
tests/*.err