tests/test-issue433

merge: move the bulk of simplemerge into core

- keep existing simplemerge command in contrib
- clean up test interface

#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue433

hg init a
cd a
echo a > a
hg commit -Ama

hg parents -r 0 doesnotexist
true