Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586.out @ 4537:2f489b00f8eb
Merge with mpm
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 10 Jun 2007 21:05:01 -0700 |
parents | 720ae5085ee3 |
children |
line wrap: on
line source
adding a adding b pulling from ../a searching for changes warning: repository is unrelated adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) C b