view tests/README @ 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.
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 19:51:59 -0700
parents d0bbd8ee50c7
children 1de6e7e1bb9f
line wrap: on
line source

To run the tests, do:

cd tests/
python run-tests.py

See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
more information on writing tests.