Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict @ 3128:15fde1970003
qimport: rename patch to patchname to avoid shadowing module
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 19 Sep 2006 08:45:39 -0700 |
| parents | e506c14382fd |
| children | 46280c004f22 |
comparison
equal
deleted
inserted
replaced
| 3127:81da3c45aabd | 3128:15fde1970003 |
|---|