view tests/test-empty @ 5239:8860f29447c1

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

hg init
hg log
hg grep wah
hg manifest
hg verify