view tests/test-strict @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

hg init

echo a > a
hg ci -d '0 0' -Ama

hg an a

echo "[ui]" >> $HGRCPATH
echo "strict=True" >> $HGRCPATH

hg an a
hg annotate a

echo % should succeed - up is an alias, not an abbreviation

hg up