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.
200 Script output follows
content-type: text/plain
content-length: 157
content-disposition: filename=sometext.txt
This is just some random text
that will go inside the file and take a few lines.
It is very boring to read, but computers don't
care about things like that.
host - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 -