Mercurial > hg
view tests/test-586.out @ 4582:7de7a80e7422
merge with main
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 14 Jun 2007 11:33:32 +0200 |
parents | 720ae5085ee3 |
children | c2a21fe60994 |
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