Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simple-update.out @ 4259:bda63383d529
Make import opportunistically use merge information
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 21 Mar 2007 14:06:25 -0700 |
parents | 9d1c3529ebbc |
children | 8feb33c2d153 |