tests/simple-merge

From: Thomas Arendsen Hein <[e-mail]>

Good. Attached is a patch which also tries to use $EMAIL as the
commit user and removed a try/except by using os.environ.get.

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