tests/test-simplemerge-cmd.out
author Brendan Cully <brendan@kublai.com>
Thu, 14 Jun 2007 10:58:49 -0700
changeset 4584 0d26e3d0eeeb
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Make parents with a file but not a revision use working directory revision.

(binary:application/octet-stream)