(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

# $Id$

include tests/test-keyword tests/test-keyword.out

include MANIFEST.in