diff tests/test-merge1 @ 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 ccfe423d3d0a
children a6477aa893b8
line wrap: on
line diff