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.
#header#
<title>Mercurial repositories index</title>
</head>
<body>
<h2>Mercurial Repositories</h2>
The specified repository "#repo|escape#" is unknown, sorry.
Please go back to the main repository list page.
#footer#