merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify