Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/simplemerge @ 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 | 1ef4445c6506 |
| children | ea7b982b6c08 |
comparison
equal
deleted
inserted
replaced
| 4582:7de7a80e7422 | 4584:0d26e3d0eeeb |
|---|