Attempt to make diff deal with null sources properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to make diff deal with null sources properly
manifest hash: 7766ed2b885640157b93474b6e42573ec061fcfb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpJsdywK+sNU5EO8RAr5gAJ9sIik+3FDyI8UvIvrWlku4QgMZWQCcDFvh
MvtqY8pFYTFLp7tM2zzTlu4=
=a0oy
-----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