tests/test-issue433
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 08 Jul 2007 13:44:41 +0200
changeset 4845 e4480f2b61e9
parent 4659 7a7d4937272b
permissions -rwxr-xr-x
Check for conflict markers in hgmerge (issue471)

#!/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