Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge2 @ 4586:1fcc076fcb17
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 | 9dcf9d45cab8 |
children |