view tests/test-simplemerge.py.out @ 4584:0d26e3d0eeeb

Make parents with a file but not a revision use working directory revision.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Jun 2007 10:58:49 -0700
parents 2e3c54fb79a3
children
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK