changeset 2019 | ced2d3620f95 |
parent 1933 | 7544700fd931 |
child 2143 | 3053fc33f545 |
--- a/tests/test-filebranch.out Wed Mar 29 12:45:33 2006 +0200 +++ b/tests/test-filebranch.out Wed Mar 29 10:27:16 2006 -0800 @@ -13,7 +13,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files (+1 heads) -(run 'hg update' to get a working copy) +(run 'hg heads' to see heads, 'hg merge' to merge) merging for foo resolving manifests getting bar