comparison tests/test-simplemerge-cmd @ 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 c6413f8f2f8e
children
comparison
equal deleted inserted replaced
4582:7de7a80e7422 4584:0d26e3d0eeeb