view tests/test-simplemerge-cmd.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 d5c3a70f8422
children ea7b982b6c08
line wrap: on
line source

(binary:application/octet-stream)