view tests/test-586 @ 6672:6004eedb13f4

keyword: 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

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A