tests/test-issue433
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3719 199dcb97a5b6
child 4659 7a7d4937272b
permissions -rwxr-xr-x
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

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