Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 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 | bb1800a7d7e1 |
children | 0912d8df5e19 |