(stable) mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

syntax: glob

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

build/*
MANIFEST