diff -r 121999244123 -r 720ae5085ee3 tests/test-586.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-586.out Sun Jun 10 21:16:58 2007 -0500 @@ -0,0 +1,13 @@ +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