imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
#!/bin/sh
"$TESTDIR/hghave" symlink || exit 80
hg init a
ln -s a link
cd a
echo foo > foo
hg status
hg status ../link