tests/test-convert-hg-source.out
author Brendan Cully <brendan@kublai.com>
Thu, 06 Sep 2007 18:12:36 -0700
changeset 5286 cbec83d9b0b4
parent 5280 11e1e574da02
permissions -rw-r--r--
Update test-record for 3ef190234b55

merging baz and foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging foo and baz
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
initializing destination new repository
scanning source...
sorting...
converting...
4 add foo bar
3 change foo
2 make bar and baz copies of foo
1 merge local copy
0 merge remote copy
comparing with ../orig
searching for changes
no changes found