| author | Brendan Cully <brendan@kublai.com> |
| Fri, 29 Sep 2006 13:00:36 -0700 | |
| changeset 3188 | 705e30c0a230 |
| parent 3155 | c82ea81d6850 |
| child 3257 | c93ce7f10f85 |
| permissions | -rw-r--r-- |
checkout 2 files updated, 0 files merged, 2 files removed, 0 files unresolved merge resolving manifests overwrite None branchmerge True partial False ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c b: remote created -> g b2: remote created -> g getting b getting b2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) blahblah foo