Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1.out @ 3236:696c656202a0
context: make filectx remember changectx in changectx.filectx
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 15:02:28 -0500 |
parents | c82ea81d6850 |
children | c93ce7f10f85 |
line wrap: on
line source
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