tests/test-586.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 30 Dec 2007 17:45:26 +0100
changeset 5762 c2a21fe60994
parent 4535 720ae5085ee3
child 5764 8a5d8fb59ed2
permissions -rw-r--r--
"C" status code considered harmful, so changed to "=" (issue899) C means conflict in other SCMs, and = is more intuitive anyway.

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)
= b