view tests/test-requires @ 7821:9fe7e6acf525

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

Fixes issue1533.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
rm .hg/requires
hg tip
echo indoor-pool > .hg/requires
hg tip

true