tests/test-586.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 21 Aug 2008 19:05:18 +0200
changeset 6930 a58a611c320f
parent 5764 8a5d8fb59ed2
child 7564 f1af59451c0c
permissions -rw-r--r--
merge with crew-stable

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